Deleted Handin05
Merge remote-tracking branch 'origin/master'

Conflicts:
	Handin05/.idea/misc.xml