Merge branch 'master' of http://github.com/danzevo/Myweb

Conflicts:
	blog.sql
Merge branch 'master' of https://github.com/danzevo/Myweb

Conflicts:
	blog.sql