i changed things...
Merge branch 'master' of git@github.com:jfrederickson/crypto-proj1.git
i deleted somethings i changed
Merge branch 'master' of git@github.com:jfrederickson/crypto-proj1.git