ignore data.json
Merge branch 'master' of github.com:OOKB/grad-show-2015

Conflicts:
	app/data/data.json