Merge branch 'master' of https://github.com/marcandretr/inf4230_hw1

Conflicts:
	src/hw1/core.clj
	src/hw1/sokoban_parser.clj
Merge branch 'master' of https://github.com/marcandretr/inf4230_hw1