changes
Merge branch 'configure'
Merge branch 'configure'

Conflicts:
	Gemfile
	Gemfile.lock
changes to gemfile
Merge branch 'configure'
changes
Merge branch 'master' into configure
simple form