first clean
remove extra files
more files removed
Merge branch 'cleaning'

Conflicts:
	index.html
	jade/index.jade