Merge branch 'master' of https://github.com/nicholalexander/project2
Merge branch 'master' of https://github.com/nicholalexander/project2
made the layout cleaner
Merge pull request #36 from nicholalexander/fixlayout

Fixlayout