test
Merge branch 'master' of https://github.com/czhu12/ams

resolved conflicts

Conflicts:
	app/views.py