gems for heroku
thousands of seeds
Search takes both english and kanji at same time.
edited seeds
Merge branch 'master' of github.com:trivett/tangochan
Search now takes kana input.
Merge branch 'master' of github.com:trivett/tangochan
Search now takes Katakana.
added friendships
tweet showing button works, but too slowly
fixed search error
fixed conflicts
friendship fixes + timer(currently in app.js)
Merge pull request #5 from trivett/friends

Friends
fixed merge bug
fixed some bugs not all