cloud n paas
Merge branch 'master' of github.com:nkgw41/mysite

Conflicts:
	Gemfile.lock
	config/config.yml