remove swo
Merge branch 'master' of github.com:tengcong/KnowledgeSharing

Conflicts:
	app/assets/stylesheets/.main.css.scss.swp
	tmp/pids/server.pid
first step done