add files for final project
Merge branch 'master' into solutions