Reset to before merge
Added constants file.
Merged master into ShortlistAndMoviesArrayUpdate but chose master storyboard.