added CNAME
small nav stuff
merged master branch back in and deleted CNAME