df
Merge branch 'master' of https://github.com/falkin/OSFGamificationProject

Conflicts:
	client/index.html
	client/js/app.js
df