нахуй
Merge branch 'master' of https://github.com/rmakovyak/ecohackaton2014

Conflicts:
	app/scripts/routes/main.js
	app/styles/main.scss