more language page
Merge branch 'master' of github.com:wweliz/tandem
finishing set lang
fixed issue with out-of-date SASS; added link to TypeKit fonts; added space for color variables
Merge pull request #5 from wweliz/whitney

fixed issue with out-of-date SASS; added link to TypeKit fonts; added sp...
basic typography
Merge pull request #6 from wweliz/whitney

basic typography
Fleshes out login template
Merge remote-tracking branch 'upstream/master' into ploveTrials
Merge pull request #7 from plove13x/ploveTrials

Plove trials
progress towards user sign up and login; checking current user status before displaying each view
Merge pull request #8 from wweliz/whitney

progress towards user sign up and login; checking current user status before displaying each view
added login/logout functionality
two pages almost done
update
update
solve merge conflict to add ollie's changes
cleaning up files
removed duplicate router from main.js file
Styles Who I want to meet page