Update .gitignore
added compiled binaries to ignore
Update .gitignore
Merge branch 'master' of https://github.com/CurlyClusterfuck/BloomBurst

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/CurlyClusterfuck/BloomBurst
Ignoring compiled binaries
Adding the files that were moved
	new file:   geometry/Sprite.cpp
	new file:   geometry/Sprite.hpp
	new file:   geometry/SpriteSheet.cpp
	new file:   geometry/SpriteSheet.hpp
Fixed a typo
Added doxygen documentation.Moved objects to a different folder.
	modified:   .gitignore
	new file:   Doxyfile
	modified:   makefile
Seperated the two main options in makefile.
 Changes to be committed:
	modified:   makefile
Fixed makefile
Added documentation to planned classes.
 Changes to be committed:
	modified:   Doxyfile
	modified:   geometry/Rectangle.hpp
	modified:   geometry/Shape.hpp
	modified:   math/Vector.hpp
	modified:   physics/Entity.hpp
	modified:   physics/World.hpp
Merge branch 'develop' into sprite

Conflicts:
	.gitignore
Cherry picking changes that were undone in last commit.
Fixed several other commit errors.
Final changes for a stable release.
 Changes to be committed:
	modified:   graphics/GlutHandler.c
	deleted:    graphics/Sprite.cpp
	deleted:    graphics/Sprite.hpp
	modified:   graphics/shader.f.glsl
Added documentation and fixed type 'chunck' to 'chunk'
	modified:   geometry/Sprite.hpp
	modified:   geometry/SpriteSheet.hpp
	modified:   graphics/gl_utils.hpp
	modified:   graphics/png_utils.cpp
	modified:   graphics/png_utils.hpp
	modified:   main.cpp