back to proper layout
Merge pull request #18 from gregorybesson/develop

back to proper layout