Added some initial parsing of the command line string
Merge branch 'master' of https://github.com/TeamSkynet/quash

Merging altered code during collaboration.