changes 06-19-2013
Merge branch 'master' of https://github.com/colosaQPTI/obladyConvergence