basic layout
Merge branch 'master' of github.com:mezderman/hackathon