minor
merge
Merge branch 'master' of github.com:Coursegen/cosi105b-2015