Merge branch 'master' into issue#13

src/json_workload.hpp

src/main.cpp

src/queue.cpp

src/queue.hpp

src/scheds/bin_packing_energy.cpp

test/test_assertion_error.py

test/test_broker.py

test/test_schedulers_multi.py

test/test_users.py