refactoring
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/SeniorPanda
merge conflict