remove explicit bootstrap stuff
Merge remote-tracking branch 'ta/master'
delete temp Gemfile.lock
changes for modal
chmod 755 d.sh
Merge remote-tracking branch 'rt/master'
added backstretch gem, fix for the modal popup, change a form to link based.
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home/_setup_mail_form.html.erb
changes for modal
deleted tmp gemfile
Merge remote-tracking branch 'rt/master'
Before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/home_controller.rb
	app/views/home/index.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/home_controller.rb
Before deploy comming soon