remove unnecesary comments and cleans up directive
reformat some of the code
style map markers to match specs
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Merge pull request #254 from jjmerino/master

Update markers to match style