merge
Merge branch 'master' of https://github.com/mikk351/PyFermCalc

Conflicts:
	functions/functions.py