Download Entity Framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	TourGuide/TourGuide/packages.config
Merge branch 'master' of https://github.com/TrishDeLozier/TeamProject