gemsfile change
gemsfile change
index page chng
Merge branch 'master' of heroku.com:glacial-castle-1062
Merge branch 'master' of https://github.com/grigl/fbfeed

Conflicts:
	Gemfile