outline tests for twitter login
init
Merge branch 'master' of https://github.com/tiger-swallowtails-2013/wine_and_dash into sign_in_using_twitter
add layout and index erb
git add gitignore
add twitter, work on after twitter log in
postgres not saving data
pulls from master and made pull request
update merge conflicts
Merge pull request #7 from tiger-swallowtails-2013/merge_conflicts

Merge conflicts