first commit
added config.yml back
fixed conflict at index.html
git ignore added