Initial commit
this is my 2nd file
This is the 3rd file being commited
made changes to 1st & 3rd Files
playing with diff
deleted 3rd file
Adding .gitignore file
adding .gitignore to repo
Merge branch 'master' of https://github.com/lutzy55/Test_repo

Conflicts:
	.gitignore