made changes by team3
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014.git