working on getting data to load
Merge branch 'master' of https://github.com/eamonsen/educationapp

Conflicts:
	educationapp.js