Merge pull request #13 from taylorchiu/master

added icons to about section
Merge branch 'master' of https://github.com/ldrohan/March2014Yearbook
fixed flakey problem when clicking directly on navbar links
Merge pull request #14 from daveyk535/navbar6

fixed flakey problem when clicking directly on navbar links
Merge branch 'master' of https://github.com/ldrohan/March2014Yearbook