Commit
Merge branch 'master' of https://github.com/schmalzbauerlukas94/at.ac.fh_kufstein.1310653500_UebungenSE

Conflicts:

	.metadata/.plugins/org.eclipse.core.resources/.projects/1310653500_U1/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/1310653500_U2/.markers

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/432580828.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat