fix accidental committed conflict
added manual adjustment options

fixed typo on method name (collistionDetection=>collisionDetection)
Merge pull request #16 from therealklanni/master

Fixed a conflict (diff) that was accidentally committed in min file