horrible
Merge branch 'master' of https://github.com/KerryClav/graphics478

Conflicts:
	prototype/newproto.html
Merge branch 'master' of https://github.com/KerryClav/graphics478
Fireflies move up and down