scara/xAPI-Spec — pull request #2 by bscSCORM (2013-04-17 18:01:32+00:00)
Title: resolved merge conflict

This commit just pulls in the current state of master and resolves the merge conflict, once you accept it your PR should be mergable.