-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'
-the border and buttons
Merge remote-tracking branch 'refs/remotes/upstream/master'

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

gui
Merging main code with Curtis' new overlay
Merge branch 'master' of github.com:elElmo/risk