Initial layout
Merge pull request #1 from lukecampbell/master

Initial layout