ignored xcode user data
Merge branch 'master' of github.com:calebjohnston/window-server-config

Conflicts:
	.gitignore