ASD
Merge branch 'master' of https://github.com/aniketbhatnagar/jacks-hackathon

Conflicts:
	games/fruit spear/js/main.js

adsf