hrm
celebrity fragment working
conflict resolution
everything should work - get your celebs online
Merge branch 'ethan'