...
Merge branch 'master' of https://github.com/jangseunghun/econovation

Conflicts:
	.architect
	app/controller/TimerController.js
	app/view/PooTimer.js
main