Fancy search
Merge branch 'master' of https://github.com/mic47/itfornonprofit

Conflicts:
	summerofhack/.DS_Store
	summerofhack/db
	summerofhack/itfornonprofits/.DS_Store
	summerofhack/itfornonprofits/views.py