Migrating to PyTest
Dynamically load modules in simulator !bug!
Dynamically load modules in simulator, fixed bug
Dynamically aggregate policy risk probabilities/impacts and costs
Incremental merge
Merge master fix for #7
Fix module loading issue
Create trigger.txt
rm /__init__.py
Merge remote-tracking branch 'remotes/origin/master' into simulation

Conflicts:
	pages/__init__.py
Merge remote-tracking branch 'remotes/origin/master' into simulation

Conflicts:
	sim/policy_pdict.py
	sim/simulation.py
Merge remote-tracking branch 'remotes/origin/master' into simulation