updated readme
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
fixed redirect uri
quick fix
trying to fix ziggeo
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
pulled Liza's changes
pulled Liza's changes
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
troubleshotting Liza's merge
nothing
fixed the recorder bug
merged in ziggeo fix
rap issuses
commiting to checkout
Merge branch 'development' of github.com:alevsxm/Team-Doge into development

Conflicts:
	app/assets/javascripts/resovisions.js
	app/views/resovisions/edit.html.erb
	app/views/resovisions/show.html.erb
Merge branch 'ziggeo' into development
Merge branch 'development'
blah
pushing to heroku