extra todo
Merge branch 'master' of https://github.com/omar2112/343final
fixed a bug