my changes
Merge branch 'master' of http://github.com/samijaber/Collablog
doge changes