Updated Manifest
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/dannydelott/taserhack/ActivityMain.java
Updated Manifest