I want to commit the file
Merge branch 'master' of github.com:JaxMGI/Fewi

Conflicts:
	HISTORY