first commit: beginning asg 1
Merge https://github.com/chaikens/CSI500