Changing stuff
Merge branch 'master' of https://github.com/makerspace/LasaurApp

Conflicts:
	frontend/js/app.js