thrmtddt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Looooool/src/com/example3/looooool/MainActivity.java