Inital commit
added entire team to pool
Fixed merge conflicts