edit awesomefile
edit awesomefile
Merge branch 'master' into new_func

Conflicts:
	awesomefile