Merge pull request #13 from fgarbagnati/master

fixing weird merge issues
Merge pull request #15 from fgarbagnati/initial_setup

Merge pull request #14 from fgarbagnati/master
Merge pull request #16 from fgarbagnati/making_some_models

Merge pull request #13 from fgarbagnati/master
Merge pull request #17 from fgarbagnati/master

fixing weird merge issues