added prey model and controller
Clean before starting search
Fixed merge conflicts with search bar
Created search method in application controller
Merge conflicts
favicon stuff
merge conflicts
sign out done
added feed link to current user only
Merge pull request #4 from ashag/sign-out

Sign out
Merge branch 'tumblr' of github.com:ashag/SeeMore into sign-out
twitter search searches twitter for 10 tweets that include the username
adds container & temp background for readability in development
some updates to the search method but it still doesnt work
Merge branch 'master' into bootstrap
added search, figaro, and secrecy to twitter.
renders sign in form in body
removes prey placeholder validations
resolves typo in file name
Merge pull request #6 from ashag/prey

Ready to show to Elise