dynamic urls
Merge branch 'master' of https://github.com/pixces/cnksite

Conflicts:
	js/main.js