asdf
Merge branch 'master' of https://github.com/jonas-koehler/holdandmove

Conflicts:
	final/apps/rating/rating.json