edit screen
grunt build
button added
merging in master
Merge pull request #7 from joshuamaxwell/editscreen

Editscreen