Merge branch 'master' into prakhar
Changing color on collision.
Merge branch 'prakhar'