Started reading and processing data from json
Merge branch 'master' of https://github.com/birkanu/life-at-mit

Conflicts:
	js/main.js