Couple linux-y links
Merge branch 'master' of github.com:thcipriani/links

Conflicts:
	Development.md