added x/y getters for character
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of github.com:Heightened/Crouching-Zombie-Hidden-Viking into dev
Merge remote-tracking branch 'origin/dev' into dev
Added minutes meeting 2
Merge remote-tracking branch 'origin/dev' into dev