merging with Josh
Merge branch 'master' of https://github.com/ewb-ucf/ewb-ucf-org
url fixes