git ignore
Simple static home page
United way logo
Footer added
ignore
Adding the search controller.
added thin
Login on home screen
Merge branch 'twitter_bootstrap' of github.com:evanwieren/unitedwayaws2013 into twitter_bootstrap
Search page
Merge remote-tracking branch 'origin/mongoid'
Merge remote-tracking branch 'origin/mongoid'
Google Maps view
Resolving conflicts with routes.rb, Gemfile.lock and .gitignore
Sessions and buttons redirect to search page
Auto redirect if already signed in
add a model to record donations
Merge branch 'donation'
Execjs and RubyRacer. This is a joke
Merge remote-tracking branch 'origin/mongoid'

Conflicts:
	Gemfile.lock
	config/routes.rb