Added gitignore
Small update
Readme and stuff
Resolved conflicts