meetup erb in progress
resolved merge conflict
we got stuff working
Merge pull request #36 from meara/tests_v1

Tests v1