add deserialize helper
add DS_Store
add stuff
add stuff
dd stuff
Merge branch 'master' of https://github.com/gregorytkach/flow

Conflicts:
	deserialize_helper_flow.lua
now if player no have energy - he cant start the game
work around energy bonus
Merge branch 'master' of https://github.com/gregorytkach/flow
add ManagerEditor
Merge branch 'master' of https://github.com/gregorytkach/flow

Conflicts:
	deserialize_helper_flow.lua