Merge pull request #8 from victor-baumbach/master

updating the OceanLabs version
Merge pull request #9 from victor-baumbach/master

Updating OceanLabs with the work I did today
Merge pull request #10 from victor-baumbach/master

xvdsfdsfsd
Merge pull request #11 from victor-baumbach/master

Fixed test_kite.py
Merge pull request #12 from victor-baumbach/master

Minor tweeks
Merge pull request #14 from OceanLabs/master

Minor tweeks
something
Merge pull request #15 from OceanLabs/notes

something
Merge pull request #16 from OceanLabs/Backup

Merge pull request #14 from OceanLabs/master
Merge pull request #4 from OceanLabs/master

Update my own