add jquery ui date and rails time input
change
merge conflicts resolved
Merge pull request #52 from fox-squirrels-2013/shadi-test

Shadi test
So, this creates the instruction screen between creating and event and interacting with that event. I know it is rough, but it works to a certain extent. For some reason, the host is directed back to the host page... I don't see this as a huge problem, but we will see.  Anyway, cheers.
auto merge with master stuff
Merge branch 'master' into creation_event_page
It's fucking necessary to merge this because I need these new tests.
Merge pull request #53 from fox-squirrels-2013/shadi-test

remove city/state/zip, add quantitiy migrations
Add proper 12 hour format to time on event show page.
Merge pull request #54 from fox-squirrels-2013/date_time

Add proper 12 hour format to time on event show page.
done with important and igot and i dont get it ajax
made the creation page better and fixed the broken tests associated therewith.
Merge branch 'master' of https://github.com/fox-squirrels-2013/potluck into creation_event_page
before pull request, I want to resolve merge conflicts locally
Merge pull request #55 from fox-squirrels-2013/creation_event_page

Creation event page
finishing up ajax
add pickadate to event fields
Merge pull request #56 from fox-squirrels-2013/time_select

add pickadate to event fields
still working on ajax
resoling conflict
Merge branch 'master' of https://github.com/fox-squirrels-2013/potluck
merging my branch  sMerge branch 'master' into ajaxification