remove complete files
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/index.html
css