removes raise
Merge branch 'master' into twitter
adds omniauth.rb file
adds log in with twitter gem
Merge pull request #4 from ahsterling/steph

Steph
fixed merge conflict
Merge pull request #5 from ahsterling/steph

Steph
fixed merge conflicts
fixed merge conflict
can sign up with twitter
adds bootstrap to form_for
logs in via twitter, finds user if already in db
Merge pull request #6 from ahsterling/twitter

Twitter
log in changes
merge conflicts
?