Metrolink project for LaunchCode.
Metrolink project for LaunchCode.
Merge origin/master

Conflicts:
	src/main/java/metrolink/Metrolink.java
	src/main/java/metrolink/Stop.java
Merge origin/master

Conflicts:
	src/main/java/metrolink/MetrolinkCalculator.java
	src/test/java/metrolink/MetrolinkCalculatorTest.java
Merge origin/master

Conflicts:
	src/main/java/metrolink/MetrolinkCalculator.java
	src/test/java/metrolink/MetrolinkCalculatorTest.java