TILUG

<<<<<<< HEAD

1. Demo by Phil
   1. Push it Phil!
      ======= <<<<<<< HEAD =======

Adding this line / edit this line

5b590dbee67a8673ef31a25f4d13feefe374fc2b <<<<<<< HEAD

This is a markdown file

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

New header

======= ##testing

9c71b5f275d9efbcc322d99b4fbc23435987adf3

More stuff