testing
Merge pull request #949 from mollybostic/master_0131

removing extra space
merge testing
fixing merge conflict #950