fixed .gitignore, nav
deleted file
deleted DS store
deleted cname
Merge branch 'gh-pages'
committing change
conlicts merged
deleted backups