first commit
worked out gitignore conflict