modified main
Merge branch 'master' of https://github.com/tungqd/SimpleBlog

Conflicts:
	views/notloggedin.php
conflict