Added a README.txt file
Added project mission statement to README file.
Add new project files
Changed file1
Changed file2
Changed file3
Getting started on the foo_feature
add totally
added seriously to file
Merge branch 'foo_feature'

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/treehouse-gitbasics/my_really_cool_project

Conflicts:
	file1
	file2
	file3