initial commit
fixed conflict from .gitignore