"Jackies changes"
Merge branch 'master' of https://github.com/karcaw/cpts224_2014