Waypoints.js added
Merge branch 'master' of github.com:mtedeschi/tracking-curiosity

Conflicts:
	index.html