Added my awesome description
Merge branch 'master' of github.com:pcamarillo/conflicts
Renamed my file to jslm.md