Working on simple button presses!
Working on simple button presses!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/brian_000/morsetraining/morse_learn.java