gjBoard classes
Merge branch 'master' of https://github.com/spix8/gameJam
Merge branch 'master' of https://github.com/spix8/gameJam
update gamejam files
Merge branch 'master' of https://github.com/spix8/gameJam

Conflicts:
	bubblewitch/dev/source/common/gjBoardView.cpp