Font face added, main js included, jquery included
Merge branch 'master' of https://github.com/Russbrown/tyketranslate

Conflicts:
	js/main.js