new file:   bootstrap/java_updator.sh
deleted:    bootstrap/java_worker.sh
Merge branch 'master' of https://github.com/voyiger/node_kpi
Merge branch 'master' of https://github.com/voyiger/node_kpi
Merge branch 'master' of https://github.com/voyiger/node_kpi
ok
modified:   views/throughput/index.jade fix tab and space mess
Merge branch 'master' of https://github.com/voyiger/node_kpi
ok
modified:   README.md
Merge branch 'master' of https://github.com/voyiger/node_kpi

Conflicts:
	views/throughput/index.jade
Merge branch 'master' of https://github.com/voyiger/node_kpi
ok
favicon issue resolved, also figure out how to use custom favicon