Merge branch 'master' of https://github.com/apprhythmia/apprhythmia.github.io

Conflicts:
	CNAME