commiting .DS_Store
ignore
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
ignore, no actual changes made