Revert "1.4"

This reverts commit f25c9d9127771b63277fa8f028524632636751f1.
1.5 too
Merge branch 'master' of ssh://git@github.com/mluc/Lab2_Git.git

Conflicts:
	HelloWorld/src/MergeConflict.txt