finished clearing uncommitted changes
pre merge
post-merge
Merge branch 'master' of https://github.com/aly006/FlunkLess
5/27 changes in ui, tags,