Added delete button in settings. Changed the icons. TODO: make activity redraw instead of reload
Added colors for blues, changed text on ON and OFF
Changed back to last commit

waiting until I can get all my changes up at once
Adding the logo and icon
Placed Logos and Icons in Drawables
Added support files for new images
Added strings for blues and ON/OFF
Changed the Icon for the app
Changed theme for Splash Page
Changed theme for all Training pages
Changed theme for all Setting pages
Merge branch 'master' into convultion-training/detection

Conflicts:
	bin/Knock_Knock.apk
	bin/classes.dex
	bin/classes/com/example/knock_knock/Notification_Screen.class
	bin/classes/com/example/knock_knock/R$dimen.class
	bin/classes/com/example/knock_knock/R$id.class
	bin/classes/com/example/knock_knock/R$layout.class
	bin/classes/com/example/knock_knock/R$menu.class
	bin/classes/com/example/knock_knock/R$string.class
	bin/classes/com/example/knock_knock/R$style.class
	bin/classes/com/example/knock_knock/SoundSettings.class
	bin/classes/com/example/knock_knock/SplashPage.class
	bin/classes/com/example/knock_knock/TrainingMenu.class
	bin/classes/com/example/knock_knock/backGroundListener$1.class
	bin/classes/com/example/knock_knock/backGroundListener.class
	bin/resources.ap_
	gen/com/example/knock_knock/R.java
	src/com/example/knock_knock/backGroundListener.java