Second test

	modified:   first.txt
 removed
Merge branch 'master' of https://github.com/vinayakkankanwadi/DoxyGit

Conflicts:
	first.txt