merge
Merge branch 'master' of github.com:astrolitterbox/GALFITWrapper
overwritten headers