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

Conflicts:
	MyApplication/.idea/gradle.xml
	MyApplication/MyApplication.iml
	MyApplication/WatchList/WatchList.iml