Add setup.py
Update
Update
Merge remote-tracking branch 'github/master'

Conflicts:
	stockholm/factory.py
fix
add gitignore