Resolves issue #17. Adds some modularity
Merge branch 'master' of github.com:chesstrian/stats001
Resolves #16 and fixes a bug in from input