Initial first_sal commit
Merge branch 'master' of github.com:Salmon88/first_sal