xD
Merge remote-tracking branch 'origin/master'

Conflicts:
	Brevaide/src/com/example/test/QCM.java