升级到bootstrap3
Merge branch 'master' of https://github.com/jimmykuu/gopher

Conflicts:
	static/css/style.css