First commit
gitignore modifield
conflicts fixed