Added user ID tracking
Merge branch 'master' of github.com:thecodemaiden/11-752-project

Conflicts:
	app/templates/index.html
	app/tester_app.py