random
Merge branch 'master' of https://github.com/alecajuice/HiVolts
merge errors maybe
Merge branch 'master' of https://github.com/alecajuice/HiVolts

Conflicts:
	Hivolts/src/entity/Cell.java