Bumped version.
Merge branch 'dev'
Pushed version.
Merge branch 'dev'
Bumped version.
Bumped version.
Merge branch 'dev'
Merge remote-tracking branch 'heroku/master'

Conflicts:
	frozen-forest.js