erasing
Merge branch 'master' of https://github.com/dvidsilva/mailcademy

Conflicts:
	build/app.css
	build/app.js
	build/style.less
	build/vendor.js

Deleting stuff...