Added some cmake stuff to gitignore
Tried to implement melting and stuff
Fixed conflict