gitignore
.gitgnore conflict
development activity has moved to "master" branch