New marijuana measures may change current laws surrounding medicinal marijuana