Initial commit
Fixed gitignore merge issues