removendo o app.js
removendo o app.js
Merge branch 'ACME' of https://github.com/izzui/learning-channel into ACME

Conflicts:
	LearningChannel/app/app.js