Sign up pagina
Sign up pagina
recovery pagina
recovery pagina
Sign up pagina
recovery pagina
Merge branch 'master' of https://github.com/Zenj1n/Watch-List

Conflicts:
	MyApplication/.idea/gradle.xml
	MyApplication/.idea/libraries/appcompat_v7_19_1_0.xml
	MyApplication/WatchList/WatchList.iml
	MyApplication/WatchList/src/main/AndroidManifest.xml
	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/MainActivity.java
	MyApplication/WatchList/src/main/res/values/strings.xml
	MyApplication/settings.gradle
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/.idea/libraries/appcompat_v7_19_1_0.xml
Merge branch 'master' of https://github.com/Zenj1n/Watch-List

Conflicts:
	MyApplication/app/app.iml