Added some stuff to the dict
Merge branch 'master' of ssh://github.com/jackbowen/CSC466_Project3_General