Merge branch 'master' of ssh://github.com/igoryen/Project566

Conflicts:
	business_rules.txt
Merge branch 'master' of ssh://github.com/igoryen/Project566

Conflicts:
	business_rules.txt
Put more details in the Email Subscription function
added a thing
Lily's changes
Merge branch 'master' of github.com:igoryen/Project566