Initial commit
Fixed the layout a bit
some updates
Merge branch 'firstmaster'