design
Merge branch 'master' of https://github.com/hidykong/cs467NKproject

Conflicts:
	visualization/d3.layout.cloud.js