update
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon

Conflicts:
	simpler/ermanager/templates/simpler/home.html
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon
Merge?
Merge pull request #18 from kvaratskhelia/master

This thing #swag