Trying to merge problems
Merge branch 'master' of https://github.com/slallum/TAU-exercises

Conflicts:
	c/Ex2/src/game.c
	c/Ex2/src/game.h