Changed controller code so it uses new instead of index and updated routes so it generates a given path and a URL. Also changed the controller create code so if block checks for errors instead of save.
Changed new method in controller to show so its associated with a single id and doesn't create a new instance of ApprenticeForm. Form now remembers previous steps and saves attributes as it goes along the form application process.
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
Got rid of extra trailing end in welcome controller, page load works now.
Updated layouts application.html page and fixed changes that were not added in during merge from master. The subsequent pages after the first page now do not have verbose text that is on first page.
Updated view files to include a hidden field :id so that the form can progress whilst remembering inputs from previous steps. Also updated controller file such that it calls [:apprentice_form][:id] instead of just [:id]. Form now moves through while remembering the id that it began with in that particular session.
Added Step 4 in the application process; added update action in reason controller. Form now progresses from beginning up till step 4.
fix:fixing merge issues with sign-up and master
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
Added footer partial in reason view so page renders with necessary partials.
Merge branch 'personality' of github.com:sparkbox/apprentice-application into sign-up

Deleted redundant index files.

Conflicts:
	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
Fixed an error with a class name in Reason/Step 4 view. Button class was not enclosed in apostrophes.
Added new changes to form for fields under reason view.
fix: removed header stuff from layout
work:styled step 4
Merge pull request #39 from sparkbox/personality

fix: fix: removed header stuff from layout