.DS_Store
Fixing stupid .DS_store merge conflicts
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
add Search and Tag models
filtertag route
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide into user_profile
Merge pull request #45 from bobolinks-2014/css-steve

Css steve
tags are clickable
need to fix bug rerender
everything is clickable. fixed the bug
Starting to add features to the user page
merge
found a bug. fixed
Merge pull request #46 from bobolinks-2014/tags_clickable

Tags clickable. still need to add some better styling and a header for the page
Adding edit button to user profile
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
merge conflicts