Update town
Update glhck
Commit the work in progress collision code