minutes added
Merge branch 'master' of https://github.com/cs22120/project