changing some constants
texturing the fireworks
Merge pull request #14 from silverdev/origin/prettygood

Origin/prettygood
stated repo clean up
elimated tangentially related works
elimated the oldapp
moved project to root
working on textures
Merge branch 'master' of https://github.com/silverdev/fiARworks

Conflicts:
	newapp/src/com/slsw/fiarworks/firework/Firework.java
	newapp/src/com/slsw/fiarworks/firework/GLCamera.java
	newapp/src/com/slsw/fiarworks/firework/Spark.java
Merge branch 'master' into newapp
removed gltrace
simplified drawing to draw in center of screen
got screen space masking
another texture on the fireworks
rendering as overlay
Merge branch 'prettygood' of github.com:silverdev/fiARworks into prettygood
fireworks alpha
Merge branch 'prettygood' of https://github.com/silverdev/fiARworks into prettygood
fixed things dissapearing
Merge branch 'master' into prettygood

Conflicts:
	newapp/src/com/slsw/fiarworks/firework/GLRenderer.java