Initial commit
fixed conflicts in gitignore