Migrating to hashmaps
Fixing conflicts
Merge pull request #13 from medo/buffer_manager

Migrating to hashMap