meetups_:id_edit made
Pulling down Mearas migration
Merge branch 'master' of https://github.com/meara/brain_trade into tests_v1
added edit form with time fields
first pass at updating meetup#edit and meetup#show with date and time
fixed conflict in show file
Merge pull request #34 from meara/tests_v1

Tests v1