git ignore update
Merge branch 'master' of https://github.com/theorclord/GameDesignProject2014
fixed close combat
fixed merge and updated unit logic and unitype