Merge pull request #13 from HackShellApp/ls

Merging LS Features
Merge branches 'ls' and 'master' into ls