added the necessary twitter helper methods to get this working
added a live twitter feed to groupify
Testing twitter_feed branch locally before deployment

Merge branch 'twitter_feed' of https://github.com/fiery-skippers-2014/Festifind into origin/twitter_feed
Pulling current master into Twitter_feed local test to resolve merge conflict

Merge branch 'master' of https://github.com/fiery-skippers-2014/Festifind into origin/twitter_feed

Conflicts:
	app/controllers/index.rb
Merge pull request #12 from fiery-skippers-2014/conflict_resolved_twitter_feed

Conflict resolved twitter feed