initial commit
fixed conflict with gitignore and readme