xcv
xcv
Merge branch 'master' of https://github.com/Willadaygo/urbanvilla

Conflicts:
	home.html
	js/min/main-ck.js