Merging in master, fixing conflict in gitignore
Merging in master, fixing conflict in gitignore

boozallen/projectjellyfish,sonejah21/api,mafernando/api,AllenBW/api,sreekantch/JellyFish,mafernando/api,AllenBW/api,AllenBW/api,adderall/api,sonejah21/api,sreekantch/JellyFish,dcallner/project-jellyfish-api,projectjellyfish/api,projectjellyfish/api,normalfaults/ux,sonejah21/api,projectjellyfish/api,boozallen/projectjellyfish,stackus/api,dcallner/project-jellyfish-api,mafernando/api,sreekantch/JellyFish,adderall/api,stackus/api,boozallen/projectjellyfish,normalfaults/ux,boozallen/projectjellyfish,adderall/api,dcallner/project-jellyfish-api,stackus/api