Adding the mockups

![diff1](https://f.cloud.github.com/assets/3537376/1209815/6b21e10a-25f0-11e3-985b-2df99f12f744.JPG)
![merge](https://f.cloud.github.com/assets/3537376/1209816/6b29107e-25f0-11e3-9fe1-2084cec7c37c.JPG)
![diff2](https://f.cloud.github.com/assets/3537376/1209817/6b2aa196-25f0-11e3-9e1c-19db098fe6ee.JPG)