Real merge fix (FOR REAL) (HONEST)
Still working
Merge branch 'master' of https://github.com/RichFell/ShutterShare