Forms with full functionality
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon

Conflicts:
	simpler/ermanager/templates/ermanager/patient_edit.html
	simpler/ermanager/views.py
Merge pull request #14 from kvaratskhelia/master

Forms with full functionality