Added a gitignore
Merging stuff