Added Devesh's curriculum
Added curriculumB to website
Changed to new bootstrap
Merge branch 'master' of https://github.com/fork-ed/demo

Conflicts:
	curriculumB.json