Add prerequisites to README
Merge pull request #11 from ryanbriones/patch-2

Add prerequisites to README
updating gemfile, bumping rails to ~> 3.1.10
Merge pull request #14 from cgansen/updating_rails

updating gemfile, bumping rails to ~> 3.1.10
Adding a working cap deploy file.
changing the deployment user to 'adopt'
Merge branch 'development' of github.com:cfachicago/adopt-a-sidewalk into adding_capistrano

Conflicts:
	Gemfile.lock
rm deprecated devise option that was causing build issues
Merge branch 'master' of github.com:cfachicago/adopt-a-sidewalk into adding_capistrano
fixing refs to repos
Merge pull request #15 from cgansen/adding_capistrano

Adding a capistrano config for deployment
Merge pull request #16 from cfachicago/development

Updating master with latest development