changed edit profile page
changed back buttons on trip show
changed size of trip complete on interface
added line between edit and back links on marker show page
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
update ReadMe File
Update README.rdoc
added readme.md file
edit to readme
Merge branch 'master' into styling2
changed wording of adding markers