fix:used  on font-face fonts: still working on issue
fix:moved some content out of application.html.erb to index.html.erb
fix: index fix
fix: could not get local Font files to work; linking out instead
Merge pull request #36 from sparkbox/welcome-form-fields
Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/new.html.erb