Added and removed files.
Fixing bad commit/merge.
Fixed merge.