grunt conflicts
gitignore
pages, css, urls, pushState
CNAME added, look at gh-pages branch