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

Conflicts:
	css/styles.css