Moved display of tip into function

Moved the code for displaying a tip into a function that can be called
with a tip number - can be used for showing a specific item if you know
its number
Merge remote-tracking branch 'origin/master' into jokes

Conflicts:
	index.html
merge changes