test
STABLE CORRECT WORKING
updating the style
spacing op
Server fixes and additions
Late Night Commits

More changes to SErver
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	framework/app.js
	framework/public/partials/matching.html
	framework/public/partials/multipleChoice.html
	framework/public/partials/other.html