Hopefully fixed all the mistakes now! :o LOL!
Commit Message! :)
Merge branch 'updated' into temp
Second Attempt at making a working merge!  Used MELD this time....
Conflicts:
	nbproject/genfiles.properties
	nbproject/project.properties
	src/morseplayer/MorseElements.java
	src/morseplayer/MorsePlayer.java
Minor Fixes before recommit
Merge branch 'temp'
Was working!  It should work.  Merge was looked over with MELD and git mergetool.
Hopefully this fixes it!

Conflicts:
	nbproject/genfiles.properties
	src/morseplayer/MorseElements.java
	src/morseplayer/MorsePlayer.java