added fortify function
fortify function
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	risk/errors/game_master.py
	risk/game_master.py
Merge pull request #31 from B-Lock/master

Added move troops function (fortify)
-adding back player_move_army in to game_master
Merge pull request #32 from clhliu/master

Adding back player_move_armies
Fixing indentation error