pom
pom
.idea
Settings from example
Merge branch 'master' into develop

Conflicts:
	.idea/encodings.xml
	rtc-quiz.iml