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

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	Guess_The_Voice.iml
	teamlrp/teamlrp.iml
Merge branch 'master' of https://github.com/team-LRP/Guess_The_Voice

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	Guess_The_Voice.iml
	teamlrp/teamlrp.iml