Merge branch 'master' of github.com:bradfeehan/desk-php

Conflicts:
	.gitignore
Merge branch 'master' of github.com:abacaphiliac/desk-php

Conflicts:
	.gitignore