temp cname
Merge branch 'master' of https://github.com/filmstant/filmstant.github.com

Conflicts:
	CNAME