crash conflicted added
Merge branch 'master' into experiment3

Conflicts:
	index.html
encoding added
temp
pull added
Merge branch 'experiment3'