emil
Merge branch 'master' of https://github.com/kristinice/shakeit

Conflicts:
	shakeit/.idea/misc.xml