Initial commit
Fixed git ignore merge conflict