refactoring:
- index.js
- dev files
- jade(dev)
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
	routes/index.js
merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
dev jade
sunday teamworking