update on today's work.
forgot one
Merge branch 'master' of https://github.com/amneher/Maxwell

Conflicts:
	noteGUI.java