misc
Merge branch 'master' of https://github.com/vmlane/FinalPaper

merge merge merge merge