resolved merge conflicts

README.md

@@ -19,7 +19,7 @@ machine on which electron is launched for logging to work**
 
 How to run (Use the --help option to get information about other command-line options):
 
-`./electron -workload <workload json>`  
+`./electron -workload <workload json>`
 
 To run electron with ignoreWatts, run the following command,
 

schedulers/proactiveclusterwidecappers.go

@@ -1,6 +1,6 @@
 /*
 Cluster wide dynamic capping
-This is not a scheduler but a scheduling scheme that schedulers can use.
+this is not a scheduler but a scheduling scheme that schedulers can use.
 */
 package schedulers
 

utilities/utils.go

@@ -7,7 +7,7 @@ The Pair and PairList have been taken from google groups forum,
 https://groups.google.com/forum/#!topic/golang-nuts/FT7cjmcL7gw
 */
 
-// Utility that helps in sorting a map[string]float64 by value.
+// Utility struct that helps in sorting a map[string]float64 by value.
 type Pair struct {
 	Key   string
 	Value float64