Added JS files.  Fixed a bug that prevented files from loading
Adding a .gitignore! woooooo
Merge pull request #1 from sarkasm/map-blocks

Adding a .gitignore! woooooo
Updating the map to be 24x16 blocks, with a 32px square grid
Merge pull request #2 from sarkasm/map-blocks

Updating the map to be 24x16 blocks, with a 32px square grid
Beginning of setting up jasmine tests
Fixing up karma runner for now (disabling everything)
Merge pull request #3 from sarkasm/grunt-jasmine

Grunt jasmine
Merge branch 'master' into feature.increase_player_count

Conflicts:
	app.coffee