Real fighting begins!
Merge branch 'master' of github.com:tphaster/sim-crowd