changed destroy to delete
Fixed styling on user, album and photo pages
can download pictures
Merged master onto styling
fixed all the conflicts
Last changes before push to heroku
Fixed mandrill password
Fixing production bugs
added registrations controller, thanks for registering pages, edited cancan abilities for about page and thanks page
Merge branch 'master' of github.com:jdeslangles/project2
Merge branch 'master' of github.com:jdeslangles/project2
working on unified interface
Making progress on styling and bug fixing
Merge branch 'master' into styling
adding users
Merge branch 'master' of github.com:jdeslangles/project2
added links to images and avatars
minor styling changes, fixed cancel buttons and links
created another use
Merge branch 'master' of github.com:jdeslangles/project2