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
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
testcommit
photo file deleted