Bugfixes
Merge branch 'master' of https://github.com/kasper0406/IO13

Conflicts:
	Project2/block.hpp
	Project2/main.cpp