update
Merge branch 'master' of https://github.com/everm1nd/whitewalls

Conflicts:
	app/views/home/index.html.slim