I want ethan's code
Merge branch 'master' of github.com:bmatejek525/Graphics
whateves
Merge branch 'master' of github.com:bmatejek525/Graphics

Conflicts:
	src/particleview
Merge branch 'master' of github.com:bmatejek525/Graphics
boids splosions better
Merge branch 'master' of github.com:bmatejek525/Graphics