initial
fixed .gitignore conflict