0.7.0
Merge branch 'master' of https://github.com/johannesippen/whitewiddow

Conflicts:
	.DS_Store