fixed database.yml
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
Merge branch 'master' of https://github.com/jbaycroft/Risktwo
commented out calculate frequency
formatting attempt on javascript