More Changes
Merge branch 'master' of https://github.com/wrahman0/Clipper

Conflicts:
	bin/classes/com/hack/clipper/MainActivity$1.class
	bin/classes/com/hack/clipper/MainActivity.class
	bin/classes/com/hack/clipper/R$id.class
	bin/classes/com/hack/clipper/R$layout.class
	bin/classes/com/hack/clipper/R$string.class
	bin/classes/com/hack/clipper/R$style.class
	gen/com/hack/clipper/R.java
	res/layout/activity_main.xml