merged with gh-pages
resloved merging issues
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'Matthew' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
added twitter button
added social buttons
Merge branch 'Matthew' into gh-pages
Merge branch 'gh-pages' of https://github.com/CrouseMatthew/Group-Project into gh-pages
added social buttons
moved social buttons to nav bar
added navigation comment
Merge pull request #19 from CrouseMatthew/Matthew

Matthew