more shorteners suggested by LEO
Merge branch 'HEAD' of git@github.com:nicolassmith/urlevaluator.git

Conflicts:
	AndroidManifest.xml