Tristan's branch first commit
Commit test
Merge branch 'Wonho' of https://github.com/TheDizzler/LoS
merge test
A merge test test
Merge branch 'master' of https://github.com/TheDizzler/LoS
Wonho master + tristan for pull request
Merge pull request #2 from TheDizzler/Tristan

One small step for a programmer, one giant leap for github understanding.