fixed collision bug
Finished level previews
calibration
Merge branch 'Julio' of https://github.com/Chase-C/OldWestDuel