tested functions 80 % working on testing the last 2
Merge branch 'master' of github.com:ecwineland/phase_2