added markupsafe
merged readme changes
Merge branch 'master' of github.com:ztane/Tonnikala