Update README.rdoc
Update README.rdoc
Update README.rdoc
Update README.rdoc
Update README.rdoc
added new api functionality
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
made super small change
added api functionality so that users, resovisions, etc are created on account sign up
quick fix to the h4 tag in _resovision.html.erb
meh
merging Monday's work to master to push to heroku
merged with ziggeo
changes to the resovisions.js file and the resovisions/edit view
fixed merges in application.js and resovision.js files
fixed ziggeo on the edit page
quick fix to edit controller
made small changes to api feature
fixed gemfile conflict