initial commit using test data - no file handling yet
fixed merge conflict in .gitignore