initial commit
merge conflicts in gitignore fixed