fixed again
Merge branch 'master' of https://github.com/alecajuice/Hivolts.git

Conflicts:
	Hivolts/src/graphics/GridPanel.java
Merge branch 'master' of https://github.com/alecajuice/Hivolts.git

Conflicts:
	Hivolts/src/graphics/GridPanel.java
Merge branch 'master' of https://github.com/alecajuice/Hivolts.git