Merge branch 'master' of https://github.com/StanleyY/TeamSheahan

Why is it making me do this? I'm just pulling... was there a conflict?
Merge branch 'master' of https://github.com/StanleyY/TeamSheahan
Merge branch 'master' of https://github.com/StanleyY/TeamSheahan
active nav link indicator
Merge pull request #8 from blkhp19/master

merging again