new file:   src/voidEJSON.litcoffee
Initial commit
Merge branch 'master' of https://github.com/uscsom/xAPI

merge
	modified:   README.md
	modified:   lib/activities/activityClass.js
	modified:   package.js
	modified:   src/activities/activityClass.litcoffee
	new file:   tests/voidTest.js
	modified:   tests/voidTest.js
	new file:   tests/activityTests.js
	new file:   courseTest.js
	modified:   package.js
Merge branch 'master' of https://github.com/uscsom/xAPI

Conflicts:
	README.md

	new file:   LICENSE
	modified:   README.md