edited file before pulling Joseph's changes from master branch
Merge branch 'development'

Conflicts:
	testing.txt

'merging' is not recognized as an internal or external command,
operable program or batch file.
'q' is not recognized as an internal or external commandperable program or batch file.
Merging changes