Removed trashcan, more work on point system
Merge branch 'master' of http://github.com/serabo/CSE335Proj1

Conflicts:
	CFrame.cpp
	CFrame.h