added some files and made an intentional merge conflict in branch1
modified reamde
modified the readme in branch1 by copy/pasteing it into the branch
changed .gitignore and readme.
.gitignore now working
ready for github
Merge branch 'master' of https://github.com/jthames/TeachersProgram