Revert cf80b55..dfd6ec1

This rolls back to commit cf80b55bfb1debddec92c7ded2a18f5f914c306e.
Merge branch 'master' of https://github.com/codemanmeet/PikQ

Conflicts:
	app/controllers/content_controller.rb
	app/views/content/index.html.erb
	config/routes.rb
Merge branch 'master' of https://github.com/codemanmeet/PikQ