???
Merge branch 'Jason' of https://github.com/Zenj1n/Watch-List into Jason

Conflicts:
	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/MainActivity.java
	MyApplication/WatchList/src/main/res/values/strings.xml
Check Username en Password