edits
removed tooltip
Merge branch 'master' of https://github.com/brycedorn/brycedorn.github.com

Conflicts:
	CNAME