add oliver.rb to repo which will puts my name to the terminal
Move oliver.rb to directory called todos1
Create README.md
Merge branch 'master' of github.com:oliverswitzer/todos
inital commit
Add ruby file that prints my name
add .gitignore
Merge branch 'master' of https://github.com/ketwalters/todos
rename README.md to README_oliver.md because of merge conflict with Jon
Merge branch 'master' of github.com:JONBRWN/todos
move oliver.rb to todo1 and delete my old directory todos1, which was an incorrect name
add *.md to .gitignore
deleted README_oliver.md and re-added README.md with *.md now in .gitignore file
fixed .gitignore