Merge pull request #5 from anonan/master

fix
commit ignore list
Merge branch 'master' of https://github.com/mystics/feedme

Conflicts:
	.gitignore
Merge pull request #6 from anonan/master

add img and aboutus
commit ads insert
Merge branch 'master' of https://github.com/mystics/feedme
new push
Merge pull request #4 from mystics/master

Pull request