adding js and images folders
adding js and images folders
adding js and images folders
Merge branch 'master' of https://github.com/HacktheUniverse/jelly-roll

Conflicts:
	.gitignore
ignore dis pls