added tests
added gitignore to shameful folders
fixed that conflict