Hey whoppy
Moppy
Noppy
Boppy
Sloppy
Stoppy
Poppy
Merge branch 'Test_branch2'

Conflicts:
	Jim_M_code.py
Merge branch 'Test_branch3'

Conflicts:
	Jim_M_code.py