Reset commit error
Adding of uncommitted files
Merge branch 'master' of https://github.com/marcB31/NihongoAssistant.git

Conflicts:
	res/layout/activity_revision_exercice.xml
	res/layout/activity_revision_plan.xml
	res/layout/activity_revision_results.xml
	src/nihongoAssistant/activity/RevisionExercise.java
	src/nihongoAssistant/activity/RevisionResults.java