s
Merge branch 'Hoye' of https://github.com/Zenj1n/Watch-List into Hoye

Conflicts:
	MyApplication/WatchList/build.gradle