gui elaborated
Merge branch 'master' of
https://github.com/TofuCasserole/ludum-dare-28.git

Conflicts:
	src/model.py