sonnnn
Merge branch 'master' of https://github.com/ladriryah/BabyBG

Conflicts:
	BabyCare/src/com/bitirme/babycare/MainActivity.java