fixing merge conflict
Up to date on all branches
Merge branch 'master' of https://github.com/alexcodreanu86/dev_overflow_dev into comments
created tag model and established habtm between posts and tags.
added voting to recomemedo
User can now add tags to posts upon post creation.
Merge branch 'master' into tags
Syalized Parts of the main layout and made main page display first 10 global posts
Merge pull request #26 from alexcodreanu86/tags

Tags
Merge pull request #27 from alexcodreanu86/navigation

Syalized Parts of the main layout and made main page display first 10 gl...
updated gemfile to include specific version of sprokets
added posts to the bottom of individual posts pages and tag controller/routes.
acutally added tag controller this time.
added page where user can see a list of all the tags with links to tags show pages.
implemented a page where user can see all posts associated with one tag and then click on tag name to go to post.
Merge pull request #28 from alexcodreanu86/tags

Tags
master list of posts on index now show up as links to posts.
Merge branch 'master' into tags
user can now add additional tags to post through edit page.
Merge pull request #29 from alexcodreanu86/tags

Tags