test
Merge branch 'master' of https://github.com/hlslaughter/devbee into feature/new_design
test
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
Merge pull request #6 from hlslaughter/develop

new design