gitignore
Merge branch 'master' of http://github.com/lion-king1986/fightpoverty

Conflicts:
	.DS_Store
	.idea/workspace.xml
ajax change