David's changes
Merge branch 'master' of github.com:ntgsx92/cs143