Bug fixes + new tag system
merge2
merge3
merge
Merge branch 'master' of https://github.com/ShaiaBak/GGJ14