Upuli 1:53 12/5/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/greenlightgo/arithmetictactoe/arithmetictactoe/MainActivity.java
upuli latest 12/08/14