diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9f17207 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Jakob Russel + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index e8d0a21..14e4529 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ RCon3D: Analyzing confocal images of microbial biofilms ------------------------------------------------------- #### Acknowledgment note: +<<<<<<< HEAD An internal function, tiffToArray, is partly borrowed from . @@ -9,6 +10,13 @@ Furthermore, some of the algorithmic framework for the CrossCor and CrossRatio a +### Loading packages +======= +#### Acknowledgment note: +An internal function, tiffToArray, is partly borrowed from . +Furthermore, some of the algorithmic framework for the CrossCor and CrossRatio analysis is also borrowed from this repository. +>>>>>>> 84951c11a0dbafcc123de0d2cb38f4a44142a852 + ### Loading packages First install the package