A HUGE UPDATE!!!11
Merge branch 'master' of github.com:denysbutenko/babulya-hackaton

Conflicts:
	src/app/main/main.controller.js
	src/index.html