Updated git_ignore
Merge branch 'master' of github.com:nhahn/nhahn.github.io
Added CNAME