Added board selection to main screen
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses

Conflicts:
	server/BoardCollection.py
	server/game/Board.py
	server/server.py
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses

Conflicts:
	server/game/Board.py
	server/server.py
Fixed merge issues
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses

Conflicts:
	server/ActionHandler.py
	server/game/Board.py
	server/server.py
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses

Conflicts:
	server/server.py