some thing
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/admin_index.html
	admin/admin_js/js.js
	admin/data/show_message.php
	admin/data/userInfo.php
	admin/index.html
	css/mycss.css
	data/Pagination.php
	data/message.php
	data/show_message.php
	html/blog.html
	html/experience.html
	html/index.html
	html/message.html
	index.html
	index.php
	myjs/js.js