work:reconfiguring fonts
work: styled h2 tags within the container
work:styled the demographic page; still working on it
work:styled step 3
Merge pull request #37 from sparkbox/welcome-form-fields

work: styled h2 tags within the container
work: supposed to use yaml, used partials instead
Merge pull request #38 from sparkbox/yamlwork

work: supposed to use yaml, used partials instead
Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up

Merged changes from master, but need to delete index file and move code over from index into show, which I am calling from GET request under rake routes.

Conflicts:
	app/views/demographics/_demographic_step.html.erb
	app/views/demographics/index.html.erb
	app/views/layouts/application.html.erb
	app/views/personality/_personality.html.erb
	app/views/personality/index.html.erb
	app/views/welcome/_apprenticeship_information