sdsd
sd
Merge branch 'master' of https://github.com/nadjalinggi/noname.git

Conflicts:
	Test/src/com/example/test/MainActivity.java