update with git client
Merge branch 'master' of https://github.com/woodyhavoc/DoublyLinkedList
Fixed conflicts