Just testing
Still testing
Merge branch 'master' of github-katfom:BlobbyProj/Blobby into katya2
Added instructions for mac to README
Removed playercharacter.cxx.orig that was sitting there
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Deleted hardcoding movement of enemy
Deleted commented out code
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna
Added comments to objectmanager.h, playercharacter.h, and point.h
Pulled from Katya's branch
pulled from Natasha's branch
Added comments
Added comment to .h, removed empty events() from .cxx