blog category
blog category
Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/webapp/index.html
Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/webapp/index.html