merging in davids
Making testing files and updating documentation and readme.txt
merging
merged with testing files and comments