refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
testing
Merge branch 'dev'

Conflicts:
	index.html
add gitignore