probably discard
ee
Merge remote-tracking branch 'origin/master'

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/OpaSoftware/.indexes/af/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/OpaSoftware/.indexes/e4/81/62/7b/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/OpaSoftware/.indexes/e4/81/62/9c/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/OpaSoftware/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/OpaSoftware/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1371666756.index
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	OpaSoftware/bin/de/rjr910/audio/AudioManager.class
	OpaSoftware/bin/de/rjr910/controller/Controller.class
	OpaSoftware/bin/de/rjr910/games/WordGame$1.class
	OpaSoftware/bin/de/rjr910/games/WordGame$2.class
	OpaSoftware/bin/de/rjr910/games/WordGame$3.class
	OpaSoftware/bin/de/rjr910/games/WordGame$4.class
	OpaSoftware/bin/de/rjr910/games/WordGame.class
	OpaSoftware/bin/de/rjr910/tests/AudioTest2.class
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 57cde6daafb21e29b74a3b25cbd7d39538e462e8.