Re-design
Merge pull request #1 from ezecafre89/master

Mashup Re-Design