Pupil link added. views set up Merging branch.
Merge branch 'filling-out-layout' into new-pupil-form

Conflicts:
	Gemfile.lock
	app/views/static_pages/home.html.erb