Edit file2 for new_feature inside the clone
Edited file2
Edited file1
This is a new commit. The -a option commits all the files and the -m option allows you to write the commit summary message
Commit before sending to github
Merge branch 'integration'

Conflicts:
	git_commands.txt
Merge branch 'master' of https://github.com/jason-hoppedupdesigns/treehouse-intro-to-git-basics

Conflicts:
	git_commands.txt