27/7/14 10:27 - Marat

sync
Merge branch 'master' of https://github.com/DavidSalzer/vibeat

Conflicts:
	.gitignore