the wepaon update
Merge branch 'master' of https://github.com/Anand2225/BirdFun.git

Conflicts:
	Birdfun/Birdfun/src/com/fyp/birdfun/FindTheNestActivity.java
Merge branch 'master' of https://github.com/Anand2225/BirdFun.git
Merge branch 'master' of https://github.com/Anand2225/BirdFun.git
commit png