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

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

	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/MainActivity.java