done?
Merge branch 'master' of github.com:czhu12/ams

Conflicts:
	app/views.py
pushong