Merge branch 'master' of github.com:hamway/couchEditor

Conflicts:
	.gitignore