manifest
Merge branch 'master' of https://github.com/Anand2225/BirdFun.git

Conflicts:
	Birdfun/Birdfun/res/layout/play_screen.xml