Changes
Merge branch 'master' of https://github.com/apps8os/trip-chain-game
Merge branch 'master' of https://github.com/apps8os/trip-chain-game
Adding printing of all maps with minor tweaks
Merge branch 'master' of https://github.com/apps8os/trip-chain-game

Conflicts:
	tripchaingame/urls.py
	tripchaingame/web/views.py