fixed rs job post
updated home page
misc updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/about_dppl-c/jobs.html
updates to home page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/home.html
updated holiday songs page
updated send php with new phpmailer code and added new phpmailer
updated send and phpmailer
fixed simple captcha problem
added message to job application form
fixed applications to reload challenge on fail
updated header message
updated gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/about_dppl-c/jobs.html
	content/home.html
	features/24-holiday-songs.html
	includes/header.html
misc updates to home and diy
updated includes
updated a to z page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	includes/header.html
updated jobs stuff