Merge branch 'master' of github.com:willhall88/Angry-Kitty
devise working with cucumber tests now
added properties to event and added join table events users
rolled back joint table added organiser id to events
added before do for event steps
2 passing in event feature
Merge branch 'master' of github.com:willhall88/Angry-Kitty
added debts to Event and User models
Passing test for total payment amount, might need to test for Date
added unit tests for sending first email
was missing some capybara email requires in various files, issue fixed, currently one test fails- need to create the email
merged remote scheduler branch with local repo
harass email template in place
Merge branch 'scheduler' of github.com:willhall88/Angry-Kitty

Conflicts:
	Gemfile
	app/models/event.rb
	db/schema.rb
Merge branch 'mailer-chaser' of github.com:willhall88/Angry-Kitty

Conflicts:
	spec/rails_helper.rb
Merge branch 'master' of github.com:willhall88/Angry-Kitty into scheduler
added confirmation emailer - reworked argument to expect "debt" instead of "user"
added confirmation emails - notification and receipt of payment
scheduler send_mail method for time bucket 3 to 7days now tolerating dattime objects
changed schedulers specs to user DateTime instances for locate deadline and last harassed date