ds
Merge branch 'master' of https://github.com/cglinka/birdwatch

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/cglinka/birdwatch

updating local machine code (nik)