comment some stuff
add old folder, remove it before releasing
fix some problems
Merge branch 'testing'

Conflicts:
	client/client.go
	main.go