add gemfile
Merge branch 'master' of https://github.com/meara/brain_trade into seed_file
added cancelled to requests and cancelled email
Merge branch 'master' of https://github.com/meara/brain_trade
Merge pull request #66 from meara/cancellation_emails

Cancellation emails
Merge branch 'master' of https://github.com/meara/brain_trade into seed_file
added a few subjects (commented out a lot of seed file code since it was breaking javascript) and added google plus button styling and footer styling
Merge pull request #67 from meara/seed_file

Seed file
added css for time option dropdowns
Merge branch 'master' of https://github.com/meara/brain_trade into seed_file
Merge pull request #68 from meara/seed_file

css of time options dropdowns
fixed javascript, deleted charAt and switched to substr
seed file now works
added gem faker
Merge pull request #70 from meara/more_css

added gem faker
bingo?