First commit!
fixed conflict with .gitignore