appcombat / support

renamed vanwege android studios
Tabs

Tabs en swipe tot nu toe
yolo
activity changes name
nieuwste libraries added
useless commit
test 1

testing merge
Alles gaat automatisch via json
verschillende films getest
titel aangepast
lol
Moet commit van github
image gefixed
Merge branch 'Hoye' of https://github.com/Zenj1n/Watch-List into Hoye

Conflicts:

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

	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/Hm_MainActivity.java
	MyApplication/WatchList/src/main/res/layout/fragment_discover.xml
	MyApplication/WatchList/src/main/res/layout/hm_activity.xml
d
s
Merge branch 'Hoye' of https://github.com/Zenj1n/Watch-List into Hoye

Conflicts:
	MyApplication/WatchList/build.gradle
1
files gefixed
paar dingen gefixed