added getTimeStamp function to settings
Merge branch 'master' of https://github.com/robertdj20/Containing