Merge remote-tracking branch 'upstream/master'
Identified peep.staff_type and days_in_month table.
Add game flag for development only below tree height.
Merge pull request #31 from kevinburke/game-flag

Add game flag for development only below tree height.
Merge remote-tracking branch 'upstream/master'
Changed screenshot format from BMP to PNG (using LodePNG)

NOTE: The little popup window ("Screenshot saved to disk as") still
displays a BMP filename, but it saves a PNG file to disk.
finish scenario start and add park size calculate
Found nausea peep variable
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
label nausea with offset
Merge branch 'duncanspumpkin-master'
Merge branch 'screenshot-png' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-screenshot-png
allow BMP to still be saved with PNG as default
Merge branch 'atmaxinger-screenshot-png'
Label energy, thirst, hunger with offsets
Merge with master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/rct2.h
	src/window_game_bottom_toolbar.c
Identified monthly ride income location.
fix peep structure
Merge branch 'master' of https://github.com/lnz/OpenRCT2 into lnz-master