:)
Merge branch 'master' of https://github.com/aldoinfanzon/Manty

Conflicts:
	app/controllers/index.js
	app/styles/index.tss
Merge branch 'master' of https://github.com/aldoinfanzon/Manty