Commiting layout for merge
Merge branch 'master' of https://github.com/velebak/spaceapps
let there be favicon