.
Merge branch 'master' of https://github.com/LikeAWildfire/Mzhvyachni

Conflicts:
	.gitignore
	app/routes.js