added golden amor

At which point do i merge the branch with my master so it and the upstream (your repo) don't get "out of sync"?