added particle base
Merge branch 'master' into particles
particles an' shit, yay!
Merge branch 'master' into particles
updated particles and shit
eeeehhhh particles
small edits
added butterfly texture
Textures working
MOTHERFUCKING RAIN BITCH
Added rain mo'fo'
Merge branch 'opengl-2.1' into particles
That's fucking it. Fuck.

Conflicts:
	Makefile
	shaders/Sun.vert
	shaders/Texture2D.vert
	src/butterfly_system.cpp
	src/butterfly_system.h
	src/game.cpp
	src/graphics/texture.h
	src/particle.cpp
Merge branch 'particles'

Conflicts:
	Makefile
	src/game.cpp
	src/game.h
	src/graphics/texture.h