prettify once again
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.4
prettify
fix conflicts
Merge pull request #257 from BuracayBeach/team2_v5.4

Team2 v5.4