first commit from local
resolved .gitignore conflicts