yeah alright
Merge branch 'master' of github.com:cspeer/fysnotifier

Conflicts:
	app/views/alert_mailer/match.html.erb