css
Merge branch 'master' of https://github.com/lion-king1986/fightpoverty

Conflicts:
	.idea/workspace.xml
	profiles/commerce_kickstart/themes/omega_kickstart/template.php
Merge branch 'master' of https://github.com/lion-king1986/fightpoverty
custom.css changes
Merge branch 'master' of https://github.com/lion-king1986/fightpoverty

Conflicts:
	.DS_Store
	.idea/workspace.xml
	profiles/commerce_kickstart/themes/omega_kickstart/template.php
	sites/all/modules/.DS_Store
test ajax form