Update Vial Functions
Merge branch 'master' of https://github.com/cwarne/cpe-123

Conflicts:
	game/PowerUps1.class
	game/PowerUps1.ctxt
	game/project.greenfoot