added readme.txt
Added some blah blah
Changes to file1
changes to file2
Getting started on the foo feature
Use totally instead of seriously
talk about awesome Treehouse students
Merge branch 'foo_feature'
added some American
added more American
Merge branch 'foo_feature'

Conflicts:
	file1
Merge branch 'master' of https://github.com/joelbrennan0/my_really_cool_project