Caching - Initial Commit
Merge branch 'master' of github.com:kalpesh-webonise/pix_app

Conflicts:
	Gemfile
	db/schema.rb