adding libraries
Merge branch 'tadpole' into hamster