Implementing some more models.
Merge branch 'master' of https://github.com/nate250/csc296-2014

Conflicts:
	views/list_equipment.php
	views/list_events.php