Made a few changes
Merge branch 'master' of github.com:Jacob959/risk-ai

Conflicts:
	include/mainwindow.h
	src/mainwindow.cpp
merging
Got some of initial state functions needed to make the map working.