added delete button on markers page
added delete button on trips page
redirect to root after delete of anything
fixed merge error in markers show view
Changed user profile page
update ReadMe File
Update README.rdoc
added readme.md file
edit to readme
still working on infowindow styling
Merge branch 'master' into styling2
changed wording of adding markers
replaced show/back links with cancel
added placeholders to forms
added heroku link to readme file
added heroku link to tweet
fixed edit user path from index page to go to devise edit user url
changed abilities
errors and abilities edited
Merge branch 'master' into to_pdf