initial commit from desktop
Merge branch 'master' of http://github.com/jrsescon/affectdda2