Working on Issue 53
Solved issue 53
Merged 'iss53' in to master

Conflicts:
	trackedFile.txt

i Please enter the commit message for your changes. Lines starting