dd
ss
Merge branch 'master' of https://github.com/ericman93/BiteMe

Conflicts:
	Foddies/Foddies.csproj
	Foddies/Models/FoodTypeEnum.cs
	Foddies/Models/HostTypeEnum.cs
	Foddies/Models/MeetUp.cs
	Foddies/Models/MeetUpRepository.cs
fixed
Merge branch 'master' of https://github.com/ericman93/BiteMe

Conflicts:
	Foddies/Models/HostTypeEnum.cs
fixed git