bug: working on @font-face problem
Merge branch 'master' of github.com:sparkbox/apprentice-application into welcome-form-fields

Conflicts:
	app/assets/stylesheets/apprentices.css.scss
	app/views/layouts/application.html.erb
fix: figured out merge issues
Merge pull request #35 from sparkbox/welcome-form-fields

fix: figured out some merge issues.