updated a bunch of shit
Final commit for dataweek hackathon.