ho ho ho!
Merge branch 'master' of github.com:12sm/jinglegram

Conflicts:
	app/static/css/source/app.css