fixed playground suggest
fixing conflicts
Merge branch 'katie'
fixing changes