updated password
changed database password
Merge branch 'master' of github.com:Smunzinger/p4
fixed environment bug