Merge pull request #21 from thebrianzeng/master

added etsy api
Search stuff

Search stuff, beginnings of answer
Merge remote-tracking branch 'origin/Answer'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/example/android/softkeyboard/Bot.java
fixed merge