testing branching
Merge branch 'develop'

testing branch merging
Merge branch 'develop'

testing deleting files in branch develop then merging with master
adds gitignore file and cleans up the branches
read me updated
Merge branch 'master' into develop