Added company info
Resolved merge conflit
mergy merge merge