Update diffs b/w reset and commit
Add simple ruby file
Start on advanced merges
Continue with advanced merging
Add simple ruby file
Remove files
Commits lines as dos
Remove lines.txt
Add simple ruby file
Turn off autocrlf locally
Add simple ruby
Document function
Add outline