Finally compiles in VS (still debugging GM)
Resolved conflicts
Resolving conflicts pt 2
Merge branch 'master' of https://github.com/djichwan/JediChess

Conflicts:
	JediChess/JediChess/Board.h
	JediChess/JediChess/Piece.h
	JediChess/JediChess/Utility.h