Added tokenization of user inputs. Needs to be invoked when  = 1
Merge branch 'master' of https://github.com/emallson/systems-project