Major Refactoring
dev
more dev
Updated readme
more dev
and more dev
almost done
final few updates
Merge pull request #1 from williamknauss/refacto

Refacto