Boilerplate
Merge https://github.com/lfepp/linkup

Conflicts:
	.gitignore
	LICENSE
	README.md
Merge https://github.com/lfepp/linkup

Conflicts:
	.gitignore
	LICENSE
	README.md
Merge https://github.com/lfepp/linkup