angular is out!!!
Merge branch 'master' of https://github.com/KamiQuasi/AmIFunny

Conflicts:
	app/app.js
	app/index.html