removed Doge_app
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
welcome controller created
users and resources controller created
Merge branch 'master' of github.com:alevsxm/Team-Doge into development
Update README.rdoc
small corrections to routes.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
Update README.rdoc
changes to routes and users_controller.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
added show and edit view to resovisions
Merge branch 'resovision_controller_and_views' into development
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
addded the edit, and show methods to the resovision controller
small changes to controllers
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
began implementing linkedin api
Merge branch 'development' of github.com:alevsxm/Team-Doge into development