this is the version i want them all to be

its not merging them properly
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MonthlyTests/HalfCheck.java
Merge branch 'master' of https://github.com/cooltype/OSPchecks

Conflicts:
	src/MonthlyTests/HalfCheck.java