json and angular
Merge branch 'master' of https://github.com/stefanetoh/Iprog14_Group20_Project

Conflicts:
	index.html