Final commit for part 1.
Merge branch 'master' of http://github.com/majisto/cs373-idb