yo
add file
add ignore items
commit
Merge branch 'master' of https://github.com/anonan/feedme

Conflicts:
	gen/com/example/feedme/R.java
	res/layout/list_feed_imgonly.xml
	res/layout/list_feed_imgtext.xml
	res/layout/list_feed_textonly.xml