added map implementation
Merge branch 'master' of https://github.com/billyshears314/PicStreamer