Makefile running on Linux and OSX
Add prototype of Scale
Add scale
Some anything...
Merge branch 'architecture' of https://github.com/thiagotmb/SOLAR into architecture
Fixes Merge problems