FIXED THE BLOCKING/NULL POINTER ERROR. WOOT.
Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/feitelsonc/Amp

Conflicts:
	src/com/amp/MainActivity.java