template.html
fixing merge conflict
Merge branch 'gh-pages'
changed
changed structural elements
deleted folder
ignore
fixed folder
ignore
fix
ds
fix
deleted ds store