Changed readme again
Changed readme again
fixed readme conflict
fixed readme conflict again
added gitignore