Sync Commit
Merge branch 'master' of https://github.com/glyphe/therooms

Conflicts:
	assets/css/_layout.sass