Resolve Merge Conflicts
Merge pull request #6 from theMagicalKarp/modify-library

Set up libraries for new testing framework
Merge branch 'master' of https://github.com/theMagicalKarp/uptown-prototype into testing-framework

Conflicts:
	app.yaml