update
Merge branch 'master' of https://github.com/parash025/bizexplainer

Conflicts:
	config/environments/development.rb