Initial commit for User Story 1
Added .gitignore and README.md
Trying to merge again
Removed conflicting files