fenaren/cs420-game — pull request #52 by jpszabo (2014-11-10 21:10:46+00:00)
Title: Map blockyness merge

This is the branch we should merge. It fixes the merge conflicts with map_blockyness and master, and I added a little bit of port balancing too.