Merge Test 1

Testing merging by adding an arbitrary comment to Module.java