initial commit
Merge branch 'master' of github.com:socketubs/links

Conflicts:
	.gitignore