Initialize project
Merge branch 'master' of github.com:GeorgeWieggers/QuMixDroid

Conflicts:
	.gitignore