Organized f.get... layout

split method numbering2 into getEnergy and convertIPhone. renamed
Numbering1 to getVeloicty and Printing to printing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MainMenu.java