Merge pull request #4 from joshuamaxwell/editscreen

Editscreen
grunt build
grunt build
merging in master