made a different prototype for camera shifting into first-person
Merge remote-tracking branch 'upstream/master'
improved collisions between avatars
cleaned up collision code some
Merge remote-tracking branch 'upstream/master'
Merge pull request #160 from Ventrella/master

made camera first-person prototype and improved avatar collisions