change some text
add a CNAME file to master
Update CNAME
delete cname
Delete CNAME
Create CNAME
tweak about me
resolved merge
Merge branch 'gh-pages' of https://github.com/liliserf/liliserf.github.io into gh-pages

get gh-pages up to current version