add new firulas
show
merge
Merge branch 'develop' of github.com:sixcodes/api_hackday_21212 into develop