Merge branch 'development'

abelcarreras · Dec 15, 2015 · 1515ae4 · 1515ae4
2 parents 026bc38 + 4b9dd41
commit 1515ae4
Show file tree

Hide file tree

Showing 22 changed files with 735 additions and 747 deletions.
diff --git a/.idea/DynaPhoPy.iml b/.idea/DynaPhoPy.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml