angular mock auto grunt generated
Merge branch 'develop' of github.com:42Zavattas/42Stack into develop

Conflicts:
	app/index.html