Initial
fixed gitignore conflict