Adding fixes
Merge branch 'master' of https://github.com/CS-4400-2013/Phase_III
Merge branch 'master' of https://github.com/CS-4400-2013/Phase_III