fck dit
Merge branch 'master' of https://github.com/Zenj1n/Watch-List

Conflicts:
	MyApplication/Mealspotting/src/main/AndroidManifest.xml