css work
me
Merge pull request #7 from fiery-skippers-2014/gerla

Gerla
changes to the search bar
fixed conflicts
fixed conflicts
Merge pull request #8 from fiery-skippers-2014/greg

changes to the search bar
got text working
working version
Merge pull request #9 from fiery-skippers-2014/search

Search
pulling to local for testing

Merge branch 'fb_oauth' of https://github.com/fiery-skippers-2014/Festifind
added the necessary twitter helper methods to get this working
added a live twitter feed to groupify
Validations for User model
  *requires user to input name and email upon Sign Up
Merge pull request #11 from fiery-skippers-2014/validations

Validations
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
User can login to Facebook account through Groupy.

TODO
  *Connect Groupy authentication to user email obtain in FB.api.