Added a bunch of stuff, started the parsing and what not
Added a bunch of stuff
Semi-working line parser
Merge branch 'development'
Merge branch 'master' of github.com:mileszim/horatio