Add email field below the 'code' field (pre-populated from github, if available)
Merge branch 'house9-master'

Conflicts:
	app.rb