2-23-14 session
updates files to working versions
Merge branch 'ben'
Updates globals to locals