first buttons
working toggle class
created client view and controller
created desktop view
Bring in hard-coded news articles on the list
Merge conflict
Merge conflict resolution
created server side api
merge conflict