Merge pull request #5 from billliu1992/master

Starting new layout
Merge pull request #6 from drew212/master

A