Probably biting off more than I can chew
Merge branch 'master' into awesome_feature

Conflicts:
	file2
	file3