escape functionality
playing with an idea for Ari
added notodo functionality
catching up with development
updating with development
everything working
Merge pull request #9 from AriGonzo/feature/editing

Feature/editing2