committing first fork change
dev2 fork commit
Merge branch 'dev2' into dev1

Conflicts:
	hello.html
adding old website files for tracking
Merge branch 'dev1'