Fixing Oops
Merge branch 'master' of https://github.com/stprima/BeshtoTalkie

Conflicts:
	src/com/beshtotalkie/HomeScreen.java