Adde things
fixed merge conflict with master
Merge pull request #2 from duke-compsci408-fall2014/dev

dev into master