1
2
some design changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
	NewsFeed.iml
design