fixed issue
Merge branch 'master' of github.com:ivijayprasad/white_collar
Made changes for hackday 2014