changes
Merge branch 'master' of github.com:chrismayu/reef_sense

Conflicts:
	app/controllers/reef_tanks_controller.rb
	app/views/reef_tanks/table.html.erb
	config/routes.rb