Remove testing file
Merge branch 'dev'

Testing complete.