Merge branch 'master' of https://github.com/cs480-projects/cs480-projects.github.io

Author: jaroonl