Merge pull request #6 from ahsterling/twitter

Twitter
log in changes
merge conflicts
?
Merge pull request #7 from ahsterling/steph

Steph
add user log in
add login partial
Merge branch 'master' into steph
Merge pull request #8 from ahsterling/steph

Steph
adds twitter sign up option to user new page