Debut BDD
BDD
Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/labo/ingesup/series/activities/GenreActivity.java
	app/src/main/res/layout/activity_genre.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/labo/ingesup/series/activities/GenreActivity.java
	app/src/main/res/values/strings.xml
Mise en place de la base de donnée
Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/labo/ingesup/series/activities/DetailActivity.java
	app/src/main/java/com/example/labo/ingesup/series/bean/Serie.java