reinitializing
:x
Merge branch 'master' of https://github.com/asgards1990/TP_blocNote

Conflicts:
	.classpath
	bin/TP_blocNote.apk
	bin/classes.dex
	bin/classes/com/example/tp_blocnote/MainActivity$1.class
	bin/classes/com/example/tp_blocnote/MainActivity$10.class
	bin/classes/com/example/tp_blocnote/MainActivity$2.class
	bin/classes/com/example/tp_blocnote/MainActivity$3.class
	bin/classes/com/example/tp_blocnote/MainActivity$4.class
	bin/classes/com/example/tp_blocnote/MainActivity$5.class
	bin/classes/com/example/tp_blocnote/MainActivity$6.class
	bin/classes/com/example/tp_blocnote/MainActivity$7$1.class
	bin/classes/com/example/tp_blocnote/MainActivity$7.class
	bin/classes/com/example/tp_blocnote/MainActivity$8.class
	bin/classes/com/example/tp_blocnote/MainActivity$9.class
	bin/classes/com/example/tp_blocnote/MainActivity$SmileyGetter.class
	bin/classes/com/example/tp_blocnote/MainActivity.class
	bin/classes/com/example/tp_blocnote/R$drawable.class
	bin/classes/com/example/tp_blocnote/R$id.class
	bin/classes/com/example/tp_blocnote/R$layout.class
	bin/classes/com/example/tp_blocnote/R$menu.class
	bin/classes/com/example/tp_blocnote/R$string.class
	bin/classes/com/example/tp_blocnote/R$style.class
	bin/dexedLibs/android-support-v4-20c14fe5d872d630b05b758e2387a3ba.jar
	bin/dexedLibs/annotations-b84ee487de4fc2f4c6038c46465db89d.jar
	bin/resources.ap_
	gen/com/example/tp_blocnote/R.java
	res/layout/activity_main.xml
	src/com/example/tp_blocnote/MainActivity.java