ok
jesusMerge branch 'gh-pages' of github.com:joshuaNjordan85/joshandtasmin into gh-pages

Conflicts:
	CNAME