Lol kasim
this was fun

Conflicts:
	Xu.txt
Merge branch 'master' of https://github.com/PaddeEriksson/FoodSocialNetwork

Conflicts:
	Xu.txt
Merge branch 'master' of https://github.com/PaddeEriksson/FoodSocialNetwork