updating correct js file
Merge branch 'feature/Phase2' of https://github.com/pixces/cnksite into feature/Phase2

Conflicts:
	js/main.js