fsdfsd
Merge branch 'development' of https://github.com/MCLACS/MyFeed into development

Conflicts:
	my_feed/app/views/site/index.html.erb
	my_feed/app/views/site/index.html.erb~