Reorganized menu bar
Fixed errors with git...
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/edu/clemson/cs/cpsc215/klinge2_shiz/assignment3/DataStore.class
	src/edu/clemson/cs/cpsc215/klinge2_shiz/assignment3/mainframe/MainFrame.java