Changed naming pattern for files.
Merge branch 'master' of github.com:isteddybear/project_callisto