Added Elliott Hauser to file
Merged commits