new function name
Merge branch 'master' of https://github.com/Slipsager/project1

Conflicts:
	opg2.html
blue background