minor fix
modified gitignore
Merge branch 'master' of https://github.com/davidgiga1993/SOLAR.git