changes
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	final_scrapbook_website/custumerregis.html