cname
Merge branch 'gh-pages' of https://github.com/kpkarolinap/ada_art_website into gh-pages

Conflicts:
	CNAME