Merge branch 'master' of https://github.com/djichwan/JediChess

Conflicts:
JediChess/JediChess/Piece.h
JediChess/JediChess/main.cpp
Merge for Making Weapon appropriate + Comments