FrontEnd Added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/toilet.js
	package.json
	server.js