Foreman added to control the processes
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	Gemfile
	Gemfile.lock
	config/environments/development.rb
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev