Merge branch 'master' of git@github.com:kryptick/bbbay.git

Conflicts:
	IDE.py