Initial commit
init
Merge branch 'master' of github.com:KLicheR/android-MeliMeloProject
VCS configurations
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	MeliMelo/MeliMelo.iml
	MeliMelo/src/main/res/layout/table_of_content.xml
	MeliMelo/src/main/res/values/strings.xml
First app advanced