birds
Merge branch 'master' of https://github.com/praburangki/bird_spotting

Conflicts:
	config/routes.rb