cleanup
Corrected the code in FileName.cs
Added test
merge
merge