master commit
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.gitignore
	app/views/home/index.html.erb
	bin/bundle
	bin/rails
	bin/rake
Merge remote-tracking branch 'refs/remotes/origin/master'