Updated commit to merge

Removing old file, nice new file :)