Merge branch 'thomas'
compass removal
App styling
fonts
resolve conflict
Merge local changes
Merge local changes
Merge branch 'master' of github.com:thomastuts/artedex-client
Basic style scaffolding