working on tags
Merge branch 'master' into bandell-branch

Conflicts:
	db/schema.rb