merge with mary work
Merge branch 'master' of https://github.com/Redshot/LJApp