add new func
edit awesomefile
edit awesomefile
edit awesomefile
Merge branch 'master' into new_func

Conflicts:
	awesomefile
Merge pull request #2 from gal3/new_func

add new func