Template ready
Merge branch 'master' of https://github.com/nayefmuhiar/buttercloud-rails-3-template

Conflicts:
	README.md
Merge branch 'master' of https://github.com/nayefmuhiar/buttercloud-rails-3-template