Old changes
Merge branch 'master' of github.com:jgissend10/CECSAM