new title on laptop
Merge branch 'master' of https://github.com/ostirrup/SC_training

Conflicts:
	weekend