Fix spacing issue
Fix merge conflict
Merge pull request #4 from johnewaterman/ls

Fix spacing issue