added article model
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
updated gem file - feedzirra
setup feeds model and setup feeds migration
updated articles migration to add 'posted at' datetime field
ignore
updated feed model to include check for  updates
added has_many subscriptions
ingnore
updated diagram
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
updated articleand feed model
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
started seed file
added factory girl for users
comented out validations for user for now so that we can sign up as a new user and test some stuff
Merge branch 'staging'