Initial commit
Added swp file
Merge branch 'master' of https://github.com/doddi/displayserver

Conflicts:
	.gitignore