How did these get added?
Fixed whatever you were having issues with
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/api/tags_controller.rb