It's a real lake!
Merge branch 'master' of https://github.com/chrishoage/bump

Conflicts:
	js/states/game_state.js
	js/states/preload_state.js