Random updates. Cleaned up lake
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/states/game_state.js