initial commit
fixing conflicts
adding generated files folder to gitignore