Everything is finalized, comments are good, can change N to 4-12 without GUI looking bad and working as it should
Merge branch 'master' of https://github.com/nhanolsc/nhnguyen_tnygren_2

Conflicts:
	src/pex2/Power.java
	src/pex2/PowerRequest.java
	src/pex2/Pump.java