Finished rainbow ray

a
Merge branch 'master' of https://github.com/Saucymeatman/RainbowHippie

Conflicts:
	bin/core/AssetManager.class
	bin/core/Game.class
	src/core/Game.java
Minor Changes