commit to sync
Merge branch 'master' of https://github.com/vattercw/SentinelsOfTheMultiverse

Conflicts:
	SentinelsOfTheMultiverse/SentinelsOfTheMultiverse/GameBoard.xaml.cs