derp
Merge branch 'master' of https://github.com/Zenj1n/WatchList

Conflicts:

	WatchList/WatchList/src/main/java/com/example/watchlist/watchlist/MainActivity.java
Merge branch 'master' of https://github.com/Zenj1n/WatchList

Conflicts:

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