Adding, modifying, and testing files
Test file deletion
Updated .gitignore and Guidelines
Switching to new testing branch
Testing zero-byte file
Testing zero-byte file newfile_jrn_20130627-1144
Testing various file changes
Testing added and modified files
Testing deleted files
Moved MS Word doc to a different directory
Merge branch 'jrn_1'

Conflicts:
	Testing Guidelines for Repo.docx
Merge branch 'jrn_2'