Criteria correct.
Merge branch 'master' of github.com:Charlisim/science_project