Use bootstrap now
o(*≧▽≦)ツ
Merge branch 'v2.0_bootstrap' into v1.0
basic
Merge remote-tracking branch 'origin/v1.0' into v1.0

Conflicts:
	README
	index.php