Idea source
Merge branch 'master' of https://github.com/teamreactive/swap

Conflicts:
	swap/test.py