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

Conflicts:
	summerofhack/db
	summerofhack/itfornonprofits/models.py
	summerofhack/itfornonprofits/models.pyc
	summerofhack/itfornonprofits/templates/itfornonprofits/viewprojects.html
	summerofhack/itfornonprofits/urls.py
	summerofhack/itfornonprofits/urls.pyc
	summerofhack/itfornonprofits/views.py
	summerofhack/itfornonprofits/views.pyc
	summerofhack/summerofhack/settings.py
	summerofhack/summerofhack/settings.pyc