Changed tabs in navbar
Merge branch 'master' of https://github.com/zrauschenbac/annieshopewebsite
Merge branch 'master' of https://github.com/zrauschenbac/annieshopewebsite
Rem learn more button
Merge branch 'master' of https://github.com/zrauschenbac/annieshopewebsite
added Jumbotron
merge conflicts
merge
Merge branch 'master' of https://github.com/zrauschenbac/annieshopewebsite
Merge branch 'master' of https://github.com/zrauschenbac/annieshopewebsite

Conflicts:
	WebsiteCode.html