Q2 working
Merge branch 'master' of https://github.com/toOliya/Ling570_new