Merge pull request #1 from alijc/addSafeHavens

Add safe havens
Merge remote-tracking branch 'upstream/master'
New web layout for On the Fast Track
Merge pull request #117 from alijc/master

New web layout for On the Fast Track