Added David Gardner to the roster.txt
Fixed merge errors in roster.txt