weekend20130809
Merge branch 'master' of https://github.com/awayjin/JavaScript

Conflicts:
	bootstrap/05BaseStyle.html