first post
change index.html
change gitgnore
add _includes
merge conflig