added crappy bob feature
juice man quote feature
adding another function, just because!
added bob feature
adding steps.txt
resolving merge conflict
updating steps
updating steps
updating txtfile
adding reflog!
more instructions added
updating class steps
finishing updating steps.txt
git —no-ff
additional merge notes
Merge branch 'txtfile' of github.com:ryanmcgary/github_class into txtfile

Conflicts:
	steps.txt