initial import
fixed conflict in gitignore