Links
Merge branch 'master' of github.com:thcipriani/links

Conflicts:
	Fun.md