updating urls to heroku version of app
updating urls to heroku version of app
adjusted the forms
updating urls to heroku version of app
search results
merged conflicts
merge conflicts
forms
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
trying to fix somones push
ASDFSF
fixed bugs
time for sleeps
fine one more
committing pseudo code for ability spec
Merge branch 'chore/specs_for_ability' into dev
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
latest merge
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
fixed readme