fixed extra file
Merge branch 'master' of https://github.com/Codes-With-Eagles-SWE2014/Client into jrlmwc_sprint3
Integrated Flag Handler passing for client-side code.