Adding unicorn to Gemfile
Merge branch 'refs/heads/f787b58a237cdfd3b43891dac724e119ef5f6e01'
Merge branch 'master' of github.com:ripienaar/gdash into merging

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'refs/heads/timepicker' into merging

Conflicts:
	lib/gdash/sinatra_app.rb
Merge branch 'refs/heads/timepicker'
Merge branch 'refs/heads/timepicker'
Merge branch 'refs/heads/timepicker'
Merge branch 'refs/heads/timepicker'

Conflicts:
	lib/gdash/sinatra_app.rb
Merge branch 'refs/heads/timepicker'
Merge remote-tracking branch 'upstream/master'