Initial Commit
Added gitignore
Fixed conflict with myself