code branch 1st commit. code1.php added.
code/index.php modified
code/index2.php modified
Added README.txt
Merge branch 'master' into code
code/index.php modified
Merge branch 'master' into code

Conflicts:
	code/index.php
Merge branch 'master' of https://github.com/peterlozben/MyOtherRepo

Conflicts:
	code/index.php