Merge branch 'master' of

git@github.com:WPIRoboticsEngineering/LabCodeRepoSetup.git

Conflicts:
	LabCodeRepoSetup/src/main/java/edu/wpi/rbe/LabCodeRepoSetupMain.java
	LabCodeRepoSetup/teamAssignments3001.json

Author: madhephaestus

LabCodeRepoSetup/teamAssignments3001.json

@@ -5,4 +5,4 @@
 "teamDestBaseName":["RBE300xTEAM"],
 "numberOfTeams":["20"],
 "20": ["madhephaestus","zhyma","acamilo"]
-}
+}