some basic functionality
Merge branch 'master' of github.com:kev40293/cs445-project

Conflicts:
	app/Bed.php