Merge pull request #9 from gilbertodemelo/master

Navbar finished
modified some of the names for links in the navbar.
Fixed merge issue
Merge pull request #10 from gilbertodemelo/master

fix nav bar naming issues
Fixed all links in nvabar
Fixed merge conflict
Merge pull request #11 from andreykul/master

Fixed contact us link in navbar
Add basic front page
Merge branch 'front-page'

Merge in new front page
Added We Talk Tech Page.
Merge pull request #13 from andreykul/master

Added We Talk Tech Page.
Fix merge conflicts
Merge pull request #12 from Conlectus/master

Add framework front page
Re-add top padding on body > .section
Merge pull request #14 from Conlectus/master

Re-add top padding on body > .section
Add (temporary) tiling images to red section
Add Canadian Women in Technology logo
Add logos to bottom of page
Make CanWit image shorter
Merge branch 'logo-section'