index on master: e4478d2 Started working on portals
WIP on master: e4478d2 Started working on portals
Merge commit 'stash'
Merge branch 'master' of https://github.com/blitzprog/battle-of-mages
index on master: 15906ce Merge branch 'master' of https://github.com/blitzprog/battle-of-mages
WIP on master: 15906ce Merge branch 'master' of https://github.com/blitzprog/battle-of-mages
Merge branch 'master' of https://github.com/blitzprog/battle-of-mages
Merge commit 'stash'
Merge branch 'master' of https://github.com/blitzprog/battle-of-mages

Conflicts:
	Assets/Scenes/Client.unity