Chuck norris facts
Merge branch 'master' of https://github.com/melonique/FristAngularEver

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