Icons
Merge branch 'Tigran' of https://github.com/hakobyant/FourInARow.git
into Tigran

Conflicts:
	ic_launcher-web.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
Merge branch 'Tigran' of https://github.com/hakobyant/FourInARow.git
into Tigran

Conflicts:
	bin/classes/com/example/fourinarow/GameProcessActivity$2.class
	bin/classes/com/example/fourinarow/GameProcessActivity.class
	src/com/example/fourinarow/GameProcessActivity.java
Merge branch 'Tigran' of https://github.com/hakobyant/FourInARow.git
into Tigran

Conflicts:
	bin/FourInARow.apk
	bin/classes.dex
	bin/classes/com/example/fourinarow/GameProcessActivity$1.class
	bin/classes/com/example/fourinarow/GameProcessActivity$2.class
	bin/classes/com/example/fourinarow/GameProcessActivity$MyView.class
	bin/classes/com/example/fourinarow/GameProcessActivity.class
	bin/classes/com/example/fourinarow/PickOpponentActivity$1.class
	bin/classes/com/example/fourinarow/PickOpponentActivity.class
	bin/classes/com/example/fourinarow/Player.class
	bin/resources.ap_
	src/com/example/fourinarow/GameProcessActivity.java
	src/com/example/fourinarow/Player.java