Commit to awesome_feature
Merge branch 'master' into awesome_feature
file 3 has changed
Merge branch 'master' into awesome_feature

Conflicts:
	file2
	file3
Merge pull request #3 from wgoolsby/awesome_feature

Awesome feature