finished files for competition tomorrow
Merge branch 'dev'