ignore
Merge branch 'master' of https://github.com/team-LRP/Guess_The_Voice

Conflicts:
	.idea/misc.xml