Merge conflict resolved
Movie Time Feature

Added movie tiles