Merge pull request #14 from paul-esch/master

Fork Paul's repo
Broadened reference to verb lists

Addresses https://github.com/adlnet/xAPI-Spec/issues/18
Merge pull request #17 from adlnet/master

pull in new commits from adl master
Merge pull request #118 from garemoko/verbs

Verb lists
fix: remove lines that should have been removed in query PR

The query overhaul removed the overloading of the "object" query parameter as either agent or activity, and
this was understood by reviewers -- these lines make no sense here and should have been deleted.

I think everyone missed this on review because these lines weren't added or removed.
Merge pull request #123 from bscSCORM/query_fix

fix: remove lines that should have been removed in query PR
Merge branch 'master' of https://github.com/adlnet/xAPI-Spec

Conflicts:
	xAPI.md
Merge branch 'master' of https://github.com/adlnet/xAPI-Spec
Merge branch 'master' of https://github.com/paul-esch/xAPI-Spec