merger
Merge branch 'master' of github.com:Freshmen/freshman-orienteering
Merge branch 'master' of github.com:Freshmen/freshman-orienteering
status template
Merge branch 'master' of github.com:Freshmen/freshman-orienteering