start and stop experiment
Merge branch 'master' of github.com:lindseydew/you-decide

Conflicts:
	app/views/admin_entry.scala.html
Merge branch 'master' of github.com:lindseydew/you-decide

Conflicts:
	app/views/admin_entry.scala.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala