new version on knockout
chaning gitignore
Merge branch 'master' of https://github.com/pbedynski/jwa

Conflicts:
	.gitignore
	public/index.html
	public/js/main.js