Reordered file structure to fit Google C++ Style conventions
Replaced queue_demo implementation with an object oriented implementation
Merged with master
Removed merge hints