tweet showing button works, but too slowly
fixed search error
fixed conflicts
Merge pull request #5 from trivett/friends

Friends
fixed merge bug
adding and deleting
twitter, add ,delete go
about to ajaxify
still caching
Search all day
put test javascript in list.js
flash card shows up
Merge pull request #7 from trivett/search_lists2

Search all day
merging teststart to master
Merge branch 'testStart'