Merge branch 'master' of github.com:capitalsigma/battlehack-chicago