FORMS! I have them working?
Merge pull request #11 from kvaratskhelia/master

FORMS! I have them working?
removed some unnecessaries from base
Fix the weird admin, location add issue
Merge pull request #12 from kvaratskhelia/master

Fix the weird admin, location add issue
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon
added kayla's signin page
added login page template
updated index
Merge branch 'master' of git://github.com/mezgerj/sharklightning-hackathon into mezgerj-master

Conflicts:
	simpler/ermanager/urls.py
	simpler/ermanager/views.py
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
Authentication System
Merge pull request #15 from kvaratskhelia/master

Authentication System
nice interface for seeing patients
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon