removed some unnecessaries from base
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
added reporting feature
updated index
Merge branch 'master' of git://github.com/mezgerj/sharklightning-hackathon into mezgerj-master

Conflicts:
	simpler/ermanager/urls.py
	simpler/ermanager/views.py
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon

Conflicts:
	simpler/ermanager/templates/ermanager/patient_edit.html
	simpler/ermanager/views.py