ignore

s
Merge branch 'mongoid' of github.com:evanwieren/unitedwayaws2013 into mongoid

Conflicts:
	.gitignore