add images done
applying colorbox
Merge branch 'master' of github.com:kalpesh-webonise/pix_app

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/posts_controller.rb
	app/views/dashboards/_posts.html.erb
	app/views/posts/show.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of github.com:kalpesh-webonise/pix_app
fancy box implemented