git ignore
main thing
conflict correction
testing upload
testing one last time... maybe
changed a comment
merge pls?
okay this is enough
mergeImage works on squares... with only translation2.0