implementing tagging
fixing merge conflicts in bootcamp controller