minor changes in data/ commiting so I can pull new front end stuff
Merge branch 'master' of https://github.com/jcarroll2007/Faces

Conflicts:
	index.html