Merge branch 'master' of github.com:djoeman84/cs140-err
Merge branch 'master' of github.com:djoeman84/cs140-err
Merge pull request #2 from djoeman84/gh-pages

gh->master
merge
user can now set key