up
a
Merge branch 'gh-pages' of github.com:duleorlovic/tips into gh-pages

Conflicts:
	index.md