zaki
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/router.js
	posts/posts.html
last commit