hi
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing

Conflicts:
	emotive-voting/scripts/stream.js
	emotive-voting/stream.html
because
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing
hiMerge branch 'master' of https://github.com/haoqizhang/waitsourcing
hi