merging a whole bunch of commits into one
fixed more differences
Merge pull request #26 from xxSandiLLyxx/testing_a_theory

Testing a theory