Spring cleaning
added endpoint
Merge branch 'master' of https://github.com/therauli/Submarinescape

Conflicts:
	src/app.js