test
122

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

Conflicts:
	MyApplication/WatchList/src/main/res/layout/activity_main.xml