Merging
Merge branch 'master' of https://github.com/HBV1/Beygdu.git

Conflicts:
	bin/classes/com/example/beygdu/MainActivity.class
	src/com/example/beygdu/MainActivity.java