pushing desktop
Merge branch 'master' of https://github.com/ssem/lawgiverII

Conflicts: