Added Jquery
Merge branch 'master' of https://github.com/bloomspin/squirrelgame-

Conflicts:
	assets/js/main.js