copy
Merge branch 'tester'

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'
readme
readme and more