checkin and out stuff
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	Static/managingmembers.html