Final (?) working version.
Merge branch 'master' of https://github.com/benbeadle/CSCE489Project
Added Amanda's fix for the US.