Kate - merge editing
Kate - committing changes
Merge branch 'master' of https://github.com/jacqueline27hh/Dryden