Testing again
Merge branch 'master' of https://github.com/heynderickxd/Physics-Calculator

Conflicts:
	primaryMethods