Minor changes
Merge remote-tracking branch 'origin/master'
Working on adviser cc option
fixes
Merging chnages for Heroku
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor