added hall of fame
resolving merge conflict