fixed minor bugs
modified bib
Merge branch 'master' of github.com:takumib/cpsc855-final
Merge branch 'bolte'

Added new sources
Fixed telos mem
changed some bibs