modified:   .gitignore
	ignore the build resut of android project
Merge branch 'git-config' into linux
Ignore the build result of android
	modified:   src/plataform/linux/Makefile.am
	modified:   src/plataform/linux/main.cpp
	modified:   src/plataform/linux/Makefile.am