fix jump (again) + change floor + minor changes
Merge pull request #11 from lazy-senior/development

Reset + Triangle Collision
Merge pull request #1 from Systemcluster/development

Pull development from systemcluster