set up for new heroku
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
removed reference to question 4 in hazards model
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
select width test
select width 2
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
resolved conflicts
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo