A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/prog2
Merge remote-tracking branch 'origin/master' into feature-node-traits Conflicts: circle/dashboard/forms.py circle/dashboard/urls.py circle/dashboard/views.py
