reference
1053
i
11:58
Merge branch 'master' of https://github.com/Shezek/Repositorio.git

Conflicts:
	Wikout/res/layout/activity_reference.xml
	Wikout/src/com/wikout/InsertActivity.java