Deleted Stray Files
Merge fork/master