Commit nr 2
Merge branch 'master' of https://github.com/Crelde/ITU_SMU_Collaboration

Conflicts:
	Contrib/File.cs