Go back to before refactoring.
update gitignore
Remove autogenerated files
Merge branch 'old'

Conflicts:
	bin/LonelyTwitter.apk
	bin/classes.dex
	bin/resources.ap_
	gen/ca/ualberta/cs/lonelytwitter/R.java