this is the second commit.
Master message
Merge branch 'fun'

Conflicts:
	scripts/one
added some changes to two in fun
Merge branch 'fun'