Added Person, Author, and User classes
Saving changes before merging
Merge branch 'master' into apply_oop

Conflicts:
	new_grocery_list.csv
	new_grocery_list.txt
	talkative_robot.rb
Merge pull request #6 from ashtindell/apply_oop

Added Person, Author, and User classes