change
Merge branch 'master' of https://github.com/czmichael/stockScreenerGrails

Conflicts:
	grails-app/services/com/ztech/IndefiniteLifeModel.groovy
	grails-app/services/com/ztech/SimpleEPSModel.groovy