screen slides
jquery ui
Added data (Machines, Extractors, Energy, Factories, Communations)
metodo income tenia otro nombre
Merge branch 'master' of github.com:imella/howishell
Fix typo in resourceStatus
Fix data generator
Added gross to status report
Header uses resource status
Style for meetings
Finish generating the data
Fix data generator
Merge branch 'master' of github.com:imella/howishell
new build
Fix ids of monkeys and humans
Merge branch 'master' of https://github.com/imella/howishell
cells view
Merge branch 'master' of github.com:imella/howishell

Conflicts:
	coffee/0.his.coffee
	css/app.css
	index.html
fix merge conflicts
Merge branch 'master' of github.com:imella/howishell