Added (actual) wireframes + first take on designs

Made actual wireframes since I started on designs before.
fixing conflict
Merge branch 'master' of https://github.com/IDMNYU/DM2193FA2014