fixing some minor typos
Merge branch 'master' of https://github.com/jonngwx/grad-shafranov

Conflicts:
	Makefile

fixed conflict in Makefile
Merge branch 'master' of https://github.com/jonngwx/grad-shafranov

trying to merge my branch with master