Put all notifs to
Merge pull request #185 from BuracayBeach/Team_5_Version_2.0

Put all notifs to