updating
updating
changes made on 15.25 30/10/14

Merge branch 'master' of https://github.com/JWilson0/myNewDocker