Yup
Merge branch 'master' of https://github.com/jmagnusson/the-olumpics

Conflicts:
	api/app.js