merge from master
merge from master
status displaying starting event
Merge branch 'master' of github.com:Freshmen/freshman-orienteering