removed own activities from feed.
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
create sign in partial
added modal and button for modal
needed to add helpers to access devise resources
fixed if/else in user model
Put sign up in a modal
nevermind, something's weird with this.
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' into phil/javascript
fixed typo :)
removed last name from sign up and edit user. Wasn't being used.