ok, what now?
I played sooo much.... stahp me!
This is commit message.
Merge remote-tracking branch 'origin/equationVerification'

Conflicts:
	src/Main.java
	src/NorwaySpruce.java
	src/ScotsPine.java
	src/Tree.java