commit
Merge branch 'master' of github.com:wweliz/tandem

Conflicts:
	app/scripts/main.js
Merge branch 'master' of github.com:wweliz/tandem
hey
Merge branch 'master' of github.com:wweliz/tandem
starts on set language page
Merge branch 'master' of github.com:wweliz/tandem
Merge pull request #2 from olliegill/master

start on set language page