Merge remote-tracking branch 'remotes/teots/master'
Merge remote-tracking branch 'remotes/schernic/master'
Merge remote-tracking branch 'remotes/teots/master'
changed output format
Implemented the 2nd version of Gridify. It should now run in approximately n log n instead of n**2
Remove a non-neccessary import in Gridify