pull
added blogpost and fixed some bugs
solved merge conflict