first commit with gems bundled
initial commit
Merge tag 'v0.0.1'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb

I resolved the above.
Merge branch 'master' into dev