added shades
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/scripts/Game.js
i can has cheeseburger
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/art_assets/characterAssets/fade/characterFadeBodymdl.js
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
got a working enemy
aldfj
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/art_assets/characterAssets/fade/characterFadeBodymdl.js
	public/art_assets/characterAssets/fade/characterFadeMaskmdl.js
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
alsdjkf
making trees smarter
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/scripts/WorldGen.js
trees please