stuff
Might work

Merge branch 'master' of https://github.com/qazeh/haptopong

Conflicts:
	haptopong.v11.suo
	haptopong/chai3d_project.vcxproj.filters
	haptopong/pch.h
NOW stuff really should work, hopefully
Merge branch 'master' of https://github.com/qazeh/haptopong

Conflicts:
	haptopong.v11.suo