Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/marcoazn89/ZEMA
added new view back after it broke