ajout du gitignore
ajout dans le gitignore
Committing the empty Android project

We're only starting out with Android.
This empty project is our first step.
Merge branch 'master' of https://github.com/r0ck5tar/FreeTime

Conflicts:
	.gitignore
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml