Add 4 more lines
Merge branch 'master' of github.com:Wdembinski/gitTest

Conflicts:
	blah
Added WEEEEEEEE so we could see a diff between local branches
Delete several base/backup/remote files