Commit 2

Commit 2 Test Details
Test

Commit 3
Local Modify should conflict with remote

Test For Merge Test
Test

Added homer
Resolve Conflict Merge branch 'master' of https://github.com/skyscooby/gitplayground

Conflicts:
	Test