Merge pull request #1 from Solliu/master

test
Update README.md
Merge pull request #2 from Solliu/master

with in bootstrap
prepare for merge
Add slide show on index page

Merge branch 'master' of https://github.com/zivyuan/gemground into Develop

Conflicts:
	gemground.com/footer.php
	gemground.com/header.php
	gemground.com/index.php
Merge branch 'master' of https://github.com/zivyuan/gemground

Conflicts:
	gemground.com/header.php