something
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team_UI
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team_UI
Merge pull request #199 from BuracayBeach/team1/dev

- fixed announcement adding bug
Merge pull request #200 from BuracayBeach/team_UI

Team ui
- fixed announcement adding bug