Included jPanel for testing Purposes
Included jPanel for testing Purposes
Included jPanel for testing Purposes
Included package-info.java
Included jPanel for testing Purposes
Merge commit '549b2b5' into updated

Conflicts:
	.gitignore
	src/morseplayer/MorsePlayer.java
	src/morseplayer/MorseTestingPanel.form
testing
Added untested routine to mix PCM byte arrays.
Conflicts:
	src/morseplayer/package-info.java
Added untested routine to mix PCM byte arrays.

Conflicts:
	src/morseplayer/package-info.java
Added untested routine to mix PCM byte arrays.
Conflicts:
	src/morseplayer/package-info.java
Added untested routine to mix PCM byte arrays.
Conflicts:
	src/morseplayer/package-info.java
Removed package-info
Added untested routine to mix PCM byte arrays.
Removed package-info

Conflicts:
	src/morseplayer/package-info.java
created morse elements class for quick construction of pcm data
Final commit before fixing branch problem
Merge branch 'updated'

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