Coomit
Merge branch 'master' of https://github.com/borys-kupar/we-lviv

Conflicts:
	app/index.html
	app/styles/main.scss
fix
Merge branch 'master' of https://github.com/borys-kupar/we-lviv

Conflicts:
	app/scripts/routes/main.coffee