Merge branch 'master' into prakhar
Changing color on collision.
Merge branch 'prakhar'
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013 into allen