thumbs
Merge branch 'master' of github.com:mark33/este

Conflicts:
	app/client/css/app.styl