added conversion to types
Merge branch 'master' of https://github.com/donhcd/hackprinceton13
Merge with hilbert stuff, added test to run entire pipeline