Update README
Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
Update README
Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop
Added support for older data file layout (fixes #1)
Closing window now exits the program (added default close action to jframe)
Updated readme
cleaned out some old commented code