update
Merge branch 'master' of https://github.com/fuqcool/style-guide

Conflicts:
	javascript.md