Forced Merger

The devel branch was finished and functional, so it was to be merged
into the master. The merge function would not do anything. All files in
master were replaced with the files from devel.