updata
change faw
Merge branch 'master' of https://github.com/shibacow/shib

Conflicts:
	app.js
	config.js