new fonts, css, html
Merge branch 'master' of https://github.com/monotv/myfit-demo

Conflicts:
	css/bootstrap.css
	css/styles.css
	index.html
	js/main.js