-Starting my AI
Merge remote-tracking branch 'refs/remotes/upstream/master'
-fix
Merge remote-tracking branch 'refs/remotes/upstream/master'
-set default to GUI
-added more to my AI
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge remote-tracking branch 'refs/remotes/upstream/master'
Adjusting colour mapping
- adding in new colour code from last week's lab
- fixing highlight code to give more accurate colour
Adding draggable windows, disabling buttons during dialog
- dialogs now draggable
- buttons and territories no longer highlight in dialog mode
Forcing highlight when dragging dialog, setting no sleep
-the border and buttons
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	risk.py
Merge pull request #41 from clhliu/master

gui
Merge remote-tracking branch 'refs/remotes/upstream/master'