Fixes bug
Adds something
Fixes layouts
Merge branch 'master' of heroku.com:nicaminerzz
Deleted nicaminerzz rouge folder