db sql queries added
get_entry and update_entry methods added
markdown added
views added for editting
edit_entry view added
update_entry view added
pygment imported
added edit button to list_entries and pygment.css is added to base.html
edit.html and entry.html files added
requirements file updated
BDD tests, author can edit scenarios added
author, saving entry scenario added
non-author user scenario added - edit button
markdown test scenario added
login check added for entry editing
Merge branch 'step4'
yes
merge conflicts corrected