changed markers and photos
Merge branch 'development' of github.com:ninasridhar/project_2 into google_marker
Merge branch 'development' of github.com:ninasridhar/project_2 into development
Merge branch 'development' of github.com:ninasridhar/project_2 into development
some stuff
changed the margin of the article
added album image to the album index page, next stage to use parralax and links to the index page to go to the albums show page
deleted ext carrrierwave file
testcommit
photo file deleted
Responsive design
Forms are responsive now
Users are now responsive
Users are responsive now
albums index page half working
albums show page tiled
resolved conflicts after parallax
commit
bug fixed
not working