Updated files
Merge branch 'master' of https://github.com/mheine/KTH

Conflicts:
	logik13/Labb1-Tests/run_all_tests
Merge branch 'master' of https://github.com/mheine/KTH
Removed a redundant folder