1
Merge branch 'master' of https://github.com/goper/phpnotes.loc

Conflicts:
	application/classes/docs/blog.php
	application/views/index/docs/index_blog1.php
	application/views/index/docs/view_blog1.php
	media/css/style.css
	media/css/widgets.css