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
made small changes to api feature
fixed gemfile conflict
fixed application.html.erb conflict