Added notifications scaffold
Merge branch 'master' of https://github.com/aaronswartz/greendesk

Conflicts:
	db/schema.rb
Added Notifications scaffold
Conflicts fixed