sadf
sadfasdf
Merge branch 'master' of https://github.com/AlaricNorris/TestGit.git

Conflicts:
	MajiangTwins/src/com/game/twins/majiang/MainActivity.java