Initial layout
Merge pull request #1 from maguro/master

Initial layout