slight change to fix formatting
make a link to new example in index
Merge branch 'master' into gh-pages

Conflicts:
	examples/exampleLock.m