fix 23
gitignore
merege
fix 24
fix 25
fix 26
fix 27
fix 28
fix 29
fix 30
fix 31
fix 41
fix 42
merge
fix 43
fix 44
Merge branch 'fix44'

Conflicts:
	index.html