v 1.2
Merge branch 'gh-pages' of https://github.com/uraven/uraven.github.io into gh-pages

Conflicts:
	CNAME