Merge branch 'states'
Merge branch 'master' of github.com:tylerhoran/salary_calculator