Energy function modified to add support for polynomial and exponential cooling
Merge branch 'master' of https://github.com/chalmers-kandidat14/haskell-folder

Conflicts:
	Main.hs