initial
merge
Merge branch 'master' of https://github.com/yamski/jQueryGame

Conflicts:
	README.md
Merge branch 'master' of https://github.com/yamski/jQueryGame