license plate
addd in timer and updated layout
Merge remote-tracking branch 'brad/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml