added database / some calls(not yet tested)
Merge branch 'master' of https://github.com/mwchen/6872-cancerprognosis

Conflicts:
	cancerPrognosis/progApp/views.py