got rid of manual merge message.
start search
Merge branch 'master' of https://github.com/IggyIguana/exonian.git

Conflicts:
	bin/classes/app/exonian/R$id.class
	bin/classes/app/exonian/R$layout.class
	bin/classes/app/exonian/R$menu.class
	bin/classes/app/exonian/R$string.class
	bin/classes/app/exonian/R$style.class
	gen/app/exonian/R.java
	src/app/exonian/ArticleActivity.java