modify
Merge branch 'master' of https://github.com/stormmax/TopicInsight

Conflicts:
	HacksDemo/.DS_Store
connect to server
Merge branch 'master' of https://github.com/stormmax/TopicInsight