Tested adding Station.
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/members/Competitor.java
Added stations to Competitor, Parser, and BinarylapTests. Henrik Rickard
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git