preparing for merge
fixed storyboard conflict
preparing for merge
committing .DS_Store because apparently I have to
added .gitignore for .DS_Store
All repeat functionality works now