Edit file2 for new_feature
So what?
Edit file2 some more.
Merge branch 'new_feature' of /Users/agonbina/Github/./my_really_cool_project into new_feature

Conflicts:
	file2
Added the index.html
Added about.html
Added some_feature.html
Added the extra stuff for some_feature
added the test file for the new feature
The new feature is ready for deployment.