test
test
Merge branch 'master' of https://github.com/hlslaughter/devbee into feature/new_design
test
Delete .pb.pl.swp
Delete fixdevbeerepo.sh
Merge branch 'master' of https://github.com/hlslaughter/devbee into feature/new_design

Conflicts:
	scripts/fixdevbeerepo.sh
deleting a file
Merge branch 'feature/new_design' into develop