ignore local folder
Merge branch 'master' of github.com:zhang-ning/RiverJS

Conflicts:
	.gitignore