fixed seg fault
Merge branch 'master' of https://github.com/trevs231/eece-315-proj2