first commit on new layout
notes markup
Merge branch 'master' into alt-markup
removed uglify