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

Conflicts:
	final_scrapbook_website/custumerregis.html
Merge branch 'gh-pages' of https://github.com/athorat/scrapbook_burger into gh-pages

Conflicts:
	final_scrapbook_website/custumerregis.html