Pushing documentation and wireframe
Fixing merge