String Theory and M-Theory