heritage class mainActivity
Merge remote-tracking branch 'origin/master'

Conflicts:

	MyApplication/app/src/main/java/com/example/thibault/myapplication/MainActivity.java