Merge pull request #303 from Kae7in/david-api

David API Updates
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-api