added two html
add htmlfiles
sdfasf# Please enter a commit message to explain why this merge is necessary,
parallax scrolling in
parallax+navbar yes
Merge branch 'yang'
idddasf
conflic fixed