search
Merge branch 'master' of github.com:lawrence79/touch-swipe

Conflicts:
	index.html