add 2
add 3
Merge branch 'master' of https://github.com/sofring/DurianQueen

Conflicts:
	test2.py

fix the conflicts