Fixed errors in Gruntfile.coffee that prevented the server from starting.
Implemented a simple merge algorithm.
Implemented a simple test site for the merge algorithm. It's running on port 3042 by default.