added .gitignore to ignore .DS_Store
pulled from master
Changed rectangle to class and added constructor
Changed rectangle constructor to use Point
Changed Rectangle to use a Point pointer and added Rectangle attribute to object.h
Added rectangle class, and Rectangle attribute to object
added Rectangle class and added Rectangle attribute to Object
Update object.h
removed a.out from src
Merge branch 'master' of github.com:BlobbyProj/Blobby
renamed block.bmp to Block.bmp
removed blobby file
Fixed offset on Rectangle attribute
Rectangle Class properly updated

It is updated on each step and can be returned from  a getter.
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna

Conflicts:
	include/object.h
Merge branch 'master' of github.com:BlobbyProj/Blobby into deanna

Conflicts:
	include/object.h
Started implementing collision method
fighting with merging
removed object.h
copied from master