Checkpoint commit.
Test commit
Merge branch 'master' of
https://github.com/jaredswarren/AngularTutorial.git

Conflicts:
	angulartutorial/src/main/webapp/js/controllers.js