TAP! TAP! TAP!. Only if being a developer was this easy.

Signed-off-by: CallMeAldy <aldrin.holmes20@gmail.com>
Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	res/values/strings.xml

Change-Id: I368c459935481d8412b7d46f82504b9245f975bf