refactor
Merge branch 'master' of https://github.com/webdevotion/twindr
Merge branch 'master' of https://github.com/webdevotion/twindr

Conflicts:
	twindr.xcodeproj/project.pbxproj
	twindr/AppDelegate.m