Initial commit
Adding some folders to ignore
Fixed conflicts