merging
Merge branch 'master' of github.com:bmatejek525/Graphics

Conflicts:
	src/particleview
Merge branch 'master' of github.com:bmatejek525/Graphics
Merge branch 'master' of github.com:bmatejek525/Graphics
test of velocity
Merge branch 'master' of github.com:bmatejek525/Graphics

Conflicts:
	input/plane2.scn