fixed syntax errors to keep going..
Merge branch 'master' of https://github.com/bremcg/finalProject

Conflicts:
	data/data.json