Don't Commit
Merge branch 'master' of https://github.com/yurm04/MemeGen

Conflicts:

MemeGen/MemeGen.xcodeproj/project.xcworkspace/xcuserdata/Yurm.xcuserdata
d/UserInterfaceState.xcuserstate