Merge pull request #1 from QuotedGames/master

Forest generation
Optimize and fix infinite loop in drawForest
Try to fix addblock
Merge branch 'master' of https://github.com/QuotedGames/canvastilegame into QuotedGames-master

Conflicts:
	js/app.js
Merge pull request #2 from tanz-sullamora/master

Merge map generation