Merge pull request #8 from echen027/master

merge conflicts
centering layout of the main page