mikeizbicki/ucr-cs100 — pull request #352 by Liniarc (2014-11-06 01:13:46+00:00)
Title: addgrader.sh will now run more universally

If you have a signing key and it's already in the repository, it will not do anything.
If you have a signing key and it's not in the repository, it will add the key to the repository.
If you don't have a signing key, it will generate a new key as it did before.

Keys existing in the repository will no longer get overwritten.

fixed conflicts