Added merger branch for the build system. Probably going to merge AFTER the presentation branch. This is just preparing work.