Merge branch 'master' of https://github.com/Ghebrehiwet/waybackinnhtmltemplate

Conflicts:
	style.css