about to merge with master
Merge branch 'master' of github.com:newenegue/peek_frontend into ellie_friday2b

Conflicts:
	views/layout.jade
Merge branch 'master' of github.com:newenegue/peek_frontend into ellie_friday2b
Merge branch 'master' of github.com:newenegue/peek_frontend into ellie_friday2b
add hover effect for bucket container when dragging article into div
commit before merge with master
Merge branch 'ellie_friday2b'