fixed some thigns

Signed-off-by: Evan Gallo <evang10@gmail.com>
Merge branch 'master' of github.com:evangallo/EECS290Project1