My Stuff
Merge commit '3628fcf3d825c9b3cdd0349890964b87036c2d19' into Eric

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