better main
Merge branch 'master' of https://github.com/rcockbur/project
' '

Conflicts:
	prescription.py